diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 0000fcfc617150002f0f388eb4ea9e9dd79d0a8e..94c7688907a56ce324a1d4e209c457ee144ebdfc 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -58,6 +58,11 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
                 $scope.topic.newTopicText = "";
             }
             
+            // Force focus to the input
+            $timeout(function() {
+                angular.element('.roomTopicInput').focus(); 
+            }, 0);
+            
             $scope.topic.isEditing = true;
         },
         updateTopic: function() {
diff --git a/webclient/room/room.html b/webclient/room/room.html
index dba6586e001888caeb08578b5dbd4e38ddf28351..587b0057a66046e30b07b93013085463f86dbdbb 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -16,8 +16,7 @@
                         {{ events.rooms[room_id]['m.room.topic'].content.topic | limitTo: 200}}
                     </div>
                     <form ng-submit="topic.updateTopic()" ng-show="topic.isEditing" class="roomTopicForm">
-                        <input ng-model="topic.newTopicText" ng-blur="topic.cancelEdit()" class="roomTopicInput" 
-                        autofocus />
+                        <input ng-model="topic.newTopicText" ng-blur="topic.cancelEdit()" class="roomTopicInput" />
                     </form>
                 </div>
             </div>