diff --git a/js/controller/SettingsController.js b/js/controller/SettingsController.js
index 93db72be..01281967 100644
--- a/js/controller/SettingsController.js
+++ b/js/controller/SettingsController.js
@@ -14,11 +14,19 @@
         return isChecked;
     };
 
+    // TODO(vincz): add get/set store
+
     /**
      * @public
      */
     ns.SettingsController.prototype.init = function() {
 
+    	// Expand drawer when clicking 'Settings' tab.
+    	$('#settings').click(function(evt) {
+         $('.right-sticky-section').toggleClass('expanded');
+         $('#settings').toggleClass('has-expanded-drawer')
+       });
+
         // Show/hide the grid on drawing canvas:
         $.publish(Events.GRID_DISPLAY_STATE_CHANGED, [this.isShowGridChecked_()]);
         $('#show-grid').change($.proxy(function(evt) {
diff --git a/js/piskel.js b/js/piskel.js
index 74114b4a..8d067020 100644
--- a/js/piskel.js
+++ b/js/piskel.js
@@ -72,10 +72,6 @@ $.namespace("pskl");
       $('body').tooltip({
         selector: '[rel=tooltip]'
       });
-
-      $('#settings').click(function(evt) {
-        $('.right-sticky-section').toggleClass('expanded');
-      });
     },
 
     render : function (delta) {