diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6
index ec3bc602cd6..faee0ef401e 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-body.js.es6
@@ -76,6 +76,13 @@ export default Ember.Component.extend({
     }
   },
 
+  @observes('composeState')
+  disableFullscreen() {
+    if (this.get('composeState') !== Composer.OPEN) {
+      positioningWorkaround.blur();
+    }
+  },
+
   didInsertElement() {
     this._super();
     const $replyControl = $('#reply-control');
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 1aa215f534f..03b6dfff3a1 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -7,6 +7,8 @@ function applicable() {
 }
 
 let workaroundActive = false;
+let composingTopic = false;
+
 export function isWorkaroundActive() {
   return workaroundActive;
 }
@@ -22,27 +24,38 @@ function positioningWorkaround($fixedElement) {
   var done = false;
   var originalScrollTop = 0;
 
+  positioningWorkaround.blur = function(evt) {
+    if (workaroundActive) {
+      done = true;
+
+      $('#main-outlet').show();
+      $('header').show();
+
+      fixedElement.style.position = '';
+      fixedElement.style.top = '';
+      fixedElement.style.height = '';
+
+      $(window).scrollTop(originalScrollTop);
+
+      if (evt) {
+        evt.target.removeEventListener('blur', blurred);
+      }
+      workaroundActive = false;
+    }
+  };
+
   var blurredNow = function(evt) {
     if (!done && _.include($(document.activeElement).parents(), fixedElement)) {
       // something in focus so skip
       return;
     }
 
-    done = true;
-
-    $('#main-outlet').show();
-    $('header').show();
-
-    fixedElement.style.position = '';
-    fixedElement.style.top = '';
-    fixedElement.style.height = '';
-
-    $(window).scrollTop(originalScrollTop);
-
-    if (evt) {
-      evt.target.removeEventListener('blur', blurred);
+    if (composingTopic) {
+      return false;
     }
-    workaroundActive = false;
+
+    positioningWorkaround.blur(evt);
+
   };
 
   var blurred = _.debounce(blurredNow, 250);
@@ -73,7 +86,20 @@ function positioningWorkaround($fixedElement) {
 
     fixedElement.style.top = '0px';
 
-    const height = Math.max(parseInt(window.innerHeight*0.6), 350);
+    let ratio = 0.6;
+    let min = 350;
+
+    composingTopic = false;
+
+    if ($('#reply-control select.category-combobox').length > 0) {
+      composingTopic = true;
+      // creating a topic, less height
+      ratio = 0.54;
+      min = 300;
+    }
+
+    const height = Math.max(parseInt(window.innerHeight*ratio), min);
+
     fixedElement.style.height = height + "px";
 
     // I used to do this, but it seems like we don't need to with position