diff --git a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 b/app/assets/javascripts/discourse/components/tag-chooser.js.es6
index 578fb9a16d..00fc244487 100644
--- a/app/assets/javascripts/discourse/components/tag-chooser.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-chooser.js.es6
@@ -1,7 +1,7 @@
 import renderTag from 'discourse/lib/render-tag';
 
 function formatTag(t) {
-  return renderTag(t.id, {count: t.count});
+  return renderTag(t.id, {count: t.count, noHref: true});
 }
 
 export default Ember.TextField.extend({
@@ -96,7 +96,7 @@ export default Ember.TextField.extend({
         list.push(item);
       },
       formatSelection(data) {
-        return data ? renderTag(this.text(data)) : undefined;
+        return data ? renderTag(this.text(data), {noHref: true}) : undefined;
       },
       formatSelectionCssClass() {
         return "discourse-tag-select2";
diff --git a/app/assets/javascripts/discourse/lib/render-tag.js.es6 b/app/assets/javascripts/discourse/lib/render-tag.js.es6
index 5b62798541..356ee4b2c2 100644
--- a/app/assets/javascripts/discourse/lib/render-tag.js.es6
+++ b/app/assets/javascripts/discourse/lib/render-tag.js.es6
@@ -5,7 +5,7 @@ export default function renderTag(tag, params) {
   tag = Handlebars.Utils.escapeExpression(tag);
   const classes = ['tag-' + tag, 'discourse-tag'];
   const tagName = params.tagName || "a";
-  const href = tagName === "a" ? " href='" + Discourse.getURL("/tags/" + tag) + "' " : "";
+  const href = (tagName === "a" && !params.noHref) ? " href='" + Discourse.getURL("/tags/" + tag) + "' " : "";
 
   if (Discourse.SiteSettings.tag_style || params.style) {
     classes.push(params.style || Discourse.SiteSettings.tag_style);
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 32257d0072..41aef83797 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -32,6 +32,7 @@
 
               {{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}}
 
+              <br>
               {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}}
               {{d-button action="cancelEditingTopic" class="btn-small cancel-edit" icon="times"}}
             {{else}}