diff --git a/public/language/en_GB/tags.json b/public/language/en_GB/tags.json
index 49adc42b2c..f67b2ca7b5 100644
--- a/public/language/en_GB/tags.json
+++ b/public/language/en_GB/tags.json
@@ -2,5 +2,6 @@
 	"no_tag_topics": "There are no topics with this tag.",
 	"tags": "Tags",
 	"enter_tags_here": "Enter tags here. Press enter after each tag.",
+	"enter_tags_here_short": "Enter tags...",
 	"no_tags": "There are no tags yet."
 }
\ No newline at end of file
diff --git a/public/src/app.js b/public/src/app.js
index 411e5f568d..8138f956f2 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -375,6 +375,13 @@ var socket,
 		});
 	};
 
+	app.toggleNavbar = function(state) {
+		var navbarEl = $('.navbar');
+		if (navbarEl) {
+			navbarEl.toggleClass('hidden', !!!state);
+		}
+	};
+
 	function exposeConfigToTemplates() {
 		$(document).ready(function() {
 			templates.setGlobal('relative_path', RELATIVE_PATH);
diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 8ba252b125..90a9311987 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -460,6 +460,7 @@ define('composer', dependencies, function(taskbar, controls, uploads, formatting
 			$('body').css({'margin-bottom': 0});
 			$('.action-bar button').removeAttr('disabled');
 
+			app.toggleNavbar(true);
 			socket.emit('modules.composer.unregister', post_uuid);
 		}
 	}
diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js
index 75382b2b6e..fb452b838a 100644
--- a/public/src/modules/composer/resize.js
+++ b/public/src/modules/composer/resize.js
@@ -22,7 +22,8 @@ define('composer/resize', function() {
 		}
 
 		if (env === 'sm' || env === 'xs') {
-			postContainer.css('height', $(window).height() - $('#header-menu').height());
+			app.toggleNavbar(false);
+			postContainer.css('height', $(window).height());
 		}
 
 		if (config.hasImageUploadPlugin) {