diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 77d41b45a..d3165c505 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -625,10 +625,11 @@ Workspace.prototype = {
         this._desktop.connect('selected',
                               Lang.bind(this,
                                         function(clone, time) {
-                                            // Only switch to the workspace when one window is open
-                                            // We check for "2" here because the Desktop does not really count
-                                            // as a window in this context.
-                                            if (this._windows.length <= 2) {
+                                            // Only switch to the workspace when there's no application windows
+                                            // open (we always have one window for the desktop).  The problem
+                                            // is that it's too easy to miss an app window and get the wrong
+                                            // one focused.
+                                            if (this._windows.length == 1) {
                                                 this.metaWorkspace.activate(time);
                                                 Main.overview.hide();
                                             }