diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 24716ca4910..f5958d118a3 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -18,18 +18,15 @@
 
           {{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}}
           {{#if showCategoryChooser}}
-            <br>
             {{category-chooser class="small" value=buffered.category_id}}
           {{/if}}
 
           {{#if canEditTags}}
-            <br>
             {{tag-chooser tags=buffered.tags categoryId=buffered.category_id}}
           {{/if}}
 
           {{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}}
 
-          <br>
           <div class="edit-controls">
             {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}}
             {{d-button action="cancelEditingTopic" class="btn-small cancel-edit" icon="times"}}
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 4886a6f2a31..c14217df772 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -179,24 +179,29 @@
 sup sup, sub sup, sup sub, sub sub { top: 0; }
 
 // inline editing of title on mobile
-.title-wrapper {
+#topic-title .title-wrapper {
+  position: relative;
+  float: none;
+  width: 100%;
+
   input#edit-title {
-    width: 95%;
-    padding: 5px;
     box-sizing: border-box;
+    width: 100%;
+    height: 32px;
   }
 
+  .select2-container {
+    box-sizing: border-box;
+    width: 100% !important;
+  }
   .btn-small {
     padding: 8px 12px;
     margin: 6px 6px 0 0;
   }
-  .select2-container {
-    margin-top: 8px;
-    width: 95% !important;
-  }
-  .category-chooser {
-    margin-top: 8px;
-    width: 95%;
+
+  .select-box-kit.combo-box.category-chooser {
+    width: 100%;
+    margin-top: 0;
   }
 }