diff --git a/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java b/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
index 1b6c5ea..dee9d2e 100644
--- a/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
+++ b/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
@@ -66,6 +66,10 @@
         mOldViews = views;
     }
 
+    public void hide() {
+        mContainer.setVisibility(View.GONE);
+    }
+
     public void hideOldViews() {
         for (View view : mOldViews) {
             view.setVisibility(View.GONE);
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 7719c04..56cfd3d 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -800,6 +800,7 @@
         for (View view : mImageViews) {
             view.setVisibility(View.GONE);
         }
+        mEditorPlaceHolder.hide();
     }
 
     public void unselectBottomPanelButtons() {
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index ff168bc..65161e4 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -345,6 +345,7 @@
 
     public ImageShow showImageView(int id) {
         ImageShow image = null;
+        mActivity.hideImageViews();
         for (View view : mImageViews) {
             if (view.getId() == id) {
                 view.setVisibility(View.VISIBLE);