2 files changed, 13 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Hotseat.java b/src/com/cyanogenmod/trebuchet/Hotseat.java
index 9795c71a..9f6441a3 100644
--- a/src/com/cyanogenmod/trebuchet/Hotseat.java
+++ b/src/com/cyanogenmod/trebuchet/Hotseat.java
@@ -32,6 +32,8 @@ import java.util.Arrays;
 public class Hotseat extends PagedView {
     private int mCellCount;
 
+    private int mDefaultPage;
+
     private boolean mTransposeLayoutWithOrientation;
     private boolean mIsLandscape;
 
@@ -60,7 +62,7 @@ public class Hotseat extends PagedView {
             defaultPage = hotseatPages / 2;
         }
 
-        mCurrentPage = defaultPage;
+        mCurrentPage = mDefaultPage = defaultPage;
 
         TypedArray a = context.obtainStyledAttributes(attrs,
                 R.styleable.Hotseat, defStyle, 0);
@@ -247,6 +249,15 @@ public class Hotseat extends PagedView {
         }
     }
 
+    void moveToDefaultScreen(boolean animate) {
+        if (animate) {
+            snapToPage(mDefaultPage);
+        } else {
+            setCurrentPage(mDefaultPage);
+        }
+        getChildAt(mDefaultPage).requestFocus();
+    }
+
     @Override
     public void syncPages() {
     }
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index db4888e0..f90a1eb7 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -1544,6 +1544,7 @@ public final class Launcher extends Activity
                     if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive() &&
                             openFolder == null) {
                         mWorkspace.moveToDefaultScreen(true);
+                        mHotseat.moveToDefaultScreen(true);
                     }
 
                     closeFolder();