diff --git a/js/ui/overview.js b/js/ui/overview.js
index 60045298a..79ee2087e 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -261,17 +261,16 @@ const Overview = new Lang.Class({
                     Main.messageTray.show();
             }));
         this._viewSelector.connect('apps-button-checked', Lang.bind(this,
-            function() {
-                this.appsActive = true;
-                this._thumbnailsBox.hide();
-                Main.messageTray.hide();
-            }));
-        this._viewSelector.connect('apps-button-unchecked', Lang.bind(this,
-            function() {
-                this.appsActive = false;
-                this._thumbnailsBox.show();
-                if (this.visible && !this.animationInProgress)
-                    Main.messageTray.show();
+            function(vs, checked) {
+                this.appsActive = checked;
+                if (checked) {
+                    this._thumbnailsBox.hide();
+                    Main.messageTray.hide();
+                } else {
+                    this._thumbnailsBox.show();
+                    if (this.visible && !this.animationInProgress)
+                        Main.messageTray.show();
+                }
             }));
 
         this.connect('app-drag-begin',
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 82600effe..a5097c50f 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -216,10 +216,7 @@ const ViewSelector = new Lang.Class({
     },
 
     _onShowAppsButtonToggled: function() {
-        if(this._showAppsButton.checked)
-            this.emit('apps-button-checked');
-        else
-            this.emit('apps-button-unchecked');
+        this.emit('apps-button-checked', this._showAppsButton.checked);
 
         if (this.entryNonEmpty)
             this.reset();