diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 1fb2c53850..71b3fac24f 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -286,11 +286,14 @@ define(['taskbar'], function(taskbar) {
 			postContainer.find('.nav-tabs a').click(function (e) {
 				e.preventDefault();
 				$(this).tab('show');
+				var selector = $(this).attr('data-pane');
+				postContainer.find('.tab-content div').removeClass('active');
+				postContainer.find(selector).addClass('active');
 				return false;
 			});
 
 			postContainer.find('.nav-tabs a').on('shown.bs.tab', function (e) {
-  				if($(e.target).attr('href') === '#preview') {
+  				if($(e.target).attr('data-pane') === '.tab-preview') {
   					socket.emit('modules.composer.renderPreview', bodyEl.val(), function(err, preview) {
   						postContainer.find('.preview').html(preview);
   					});
@@ -412,7 +415,9 @@ define(['taskbar'], function(taskbar) {
 			postContainer.find('.file-upload-btn').removeClass('hide');
 		}
 
-		postContainer.css('visibility', 'visible');
+		postContainer.css('visibility', 'visible')
+			.css('z-index', 1);
+
 
 		composer.focusElements(post_uuid);
 	}
diff --git a/public/templates/composer.tpl b/public/templates/composer.tpl
index ea6e574df8..123f0d85b7 100644
--- a/public/templates/composer.tpl
+++ b/public/templates/composer.tpl
@@ -24,15 +24,15 @@
 		</div>
 
 		<ul class="nav nav-tabs">
-			<li class="active"><a href="#write" data-toggle="tab">Write</a></li>
-			<li><a href="#preview" data-toggle="tab">Preview</a></li>
+			<li class="active"><a data-pane=".tab-write" data-toggle="tab">Write</a></li>
+			<li><a data-pane=".tab-preview" data-toggle="tab">Preview</a></li>
 		</ul>
 
 		<div class="tab-content">
-			<div class="tab-pane active" id="write">
+			<div class="tab-pane active tab-write">
 				<textarea class="write" tabIndex="2"></textarea>
 			</div>
-			<div class="tab-pane" id="preview">
+			<div class="tab-pane tab-preview">
 				<div class="preview well"></div>
 			</div>
 		</div>