diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index da6a995d0b..9c0a3ec8e3 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -285,6 +285,12 @@ define('composer', dependencies, function(taskbar, controls, uploads, formatting
 				});
 			});
 
+			postContainer.on('click', function() {
+				if (!taskbar.isActive(post_uuid)) {
+					taskbar.updateActive(post_uuid);
+				}
+			});
+
 			bodyEl.on('input propertychange', function() {
 				preview.render(postContainer);
 			});
diff --git a/public/src/modules/taskbar.js b/public/src/modules/taskbar.js
index 41b8b76467..d79e6bc710 100644
--- a/public/src/modules/taskbar.js
+++ b/public/src/modules/taskbar.js
@@ -95,6 +95,11 @@ define('taskbar', function() {
 			var	tasks = taskbar.tasklist.find('li');
 			tasks.removeClass('active');
 			tasks.filter('[data-uuid="' + uuid + '"]').addClass('active');
+		},
+
+		isActive: function(uuid) {
+			var taskBtn = taskbar.tasklist.find('li[data-uuid="' + uuid + '"]');
+			return taskBtn.hasClass('active');
 		}
 	};
 
@@ -107,6 +112,7 @@ define('taskbar', function() {
 		discard: taskbar.discard,
 		minimize: taskbar.minimize,
 		toggleNew: taskbar.toggleNew,
-		updateActive: taskbar.updateActive
+		updateActive: taskbar.updateActive,
+		isActive: taskbar.isActive
 	}
 });