2 files changed, 5 insertions, 2 deletions
diff --git a/src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java b/src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java
index 8a66d53..8f94739 100644
--- a/src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java
+++ b/src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java
@@ -272,7 +272,7 @@ public class ChooserActivity extends FragmentActivity
 
     @Override
     public void onBackPressed() {
-        if (mSelector.getVisibility() == View.VISIBLE) {
+        if (mSelector.isEnabled()) {
             mSelector.hide();
             if (mContainerYOffset != 0) {
                 slideContentDown(mContainerYOffset);
diff --git a/src/org/cyanogenmod/theme/chooserv2/ComponentSelector.java b/src/org/cyanogenmod/theme/chooserv2/ComponentSelector.java
index b878d6b..0985c9b 100644
--- a/src/org/cyanogenmod/theme/chooserv2/ComponentSelector.java
+++ b/src/org/cyanogenmod/theme/chooserv2/ComponentSelector.java
@@ -172,6 +172,7 @@ public class ComponentSelector extends LinearLayout
         if (!Utils.hasNavigationBar(mContext)) {
             findViewById(R.id.navbar_padding).setVisibility(View.GONE);
         }
+        setEnabled(false);
     }
 
     public void setComponentType(String component) {
@@ -226,13 +227,15 @@ public class ComponentSelector extends LinearLayout
 
     public void show() {
         if (getVisibility() == View.GONE) {
+            setEnabled(true);
             setVisibility(View.VISIBLE);
             startAnimation(mAnimateIn);
         }
     }
 
     public void hide() {
-        if (getVisibility() == View.VISIBLE) {
+        if (getVisibility() == View.VISIBLE && isEnabled()) {
+            setEnabled(false);
             startAnimation(mAnimateOut);
         }
         if (mMediaPlayer != null && mMediaPlayer.isPlaying()) mMediaPlayer.stop();