diff --git a/public/src/app.js b/public/src/app.js
index 4f71588ce0..e34eb4617f 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -585,6 +585,10 @@ var socket,
 					});
 				}
 			});
+
+			require(['taskbar'], function(taskbar) {
+				taskbar.init();
+			});
 		});
 	};
 
diff --git a/public/src/modules/taskbar.js b/public/src/modules/taskbar.js
index 6404ea34b3..4114f0d184 100644
--- a/public/src/modules/taskbar.js
+++ b/public/src/modules/taskbar.js
@@ -103,16 +103,13 @@ define('taskbar', function() {
 		}
 	};
 
-	if (!taskbar.initialized) {
-		taskbar.init();
-	}
-
 	return {
 		push: taskbar.push,
 		discard: taskbar.discard,
 		minimize: taskbar.minimize,
 		toggleNew: taskbar.toggleNew,
 		updateActive: taskbar.updateActive,
-		isActive: taskbar.isActive
+		isActive: taskbar.isActive,
+		init: taskbar.init
 	}
 });