diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index 435e66f..9bba005 100644
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -16,7 +16,7 @@ const Tweener = imports.ui.tweener;
 const APP_ICON_HOVER_TIMEOUT = 200; // milliseconds
 
 const THUMBNAIL_DEFAULT_SIZE = 256;
-const THUMBNAIL_POPUP_TIME = 500; // milliseconds
+const THUMBNAIL_POPUP_TIME = 0; // milliseconds
 const THUMBNAIL_FADE_TIME = 0.1; // seconds
 
 const WINDOW_PREVIEW_SIZE = 128;
@@ -129,7 +129,10 @@ const AppSwitcherPopup = new Lang.Class({
         } else if (backward) {
             this._select(this._items.length - 1);
         } else {
-            this._select(1);
+            if (this._items[1].cachedWindows.length > 1)
+                this._select(1, 0);
+            else
+                this._select(1);
         }
     },
 
