diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 2a272e8c0c..593d576e3e 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -265,6 +265,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 
 				taskbar.push('chat', chatModal.attr('UUID'), {
 					title: username,
+					touid: touid,
 					icon: 'fa-comment',
 					state: ''
 				});
diff --git a/public/src/modules/taskbar.js b/public/src/modules/taskbar.js
index e41b287b6b..ba3ccd04c2 100644
--- a/public/src/modules/taskbar.js
+++ b/public/src/modules/taskbar.js
@@ -61,6 +61,7 @@ define('taskbar', function() {
 		var title = $('<div></div>').text(data.options.title || 'NodeBB Task').html();
 
 		var	btnEl = $('<li />')
+			.addClass(data.options.className)
 			.html('<a href="#">' +
 				(data.options.icon ? '<i class="fa ' + data.options.icon + '"></i> ' : '') +
 				(data.options.image ? '<img src="' + data.options.image + '"/> ': '') +
@@ -78,6 +79,8 @@ define('taskbar', function() {
 
 		taskbar.tasklist.append(btnEl);
 		update();
+
+		$(window).trigger('action:taskbar.pushed');
 	};
 
 	taskbar.minimize = function(module, uuid) {