diff --git a/src/apps/expander/ExpanderWindow.cpp b/src/apps/expander/ExpanderWindow.cpp
index 45785544b7..7c3b7ea34e 100644
--- a/src/apps/expander/ExpanderWindow.cpp
+++ b/src/apps/expander/ExpanderWindow.cpp
@@ -416,10 +416,15 @@ ExpanderWindow::RefsReceived(BMessage *msg)
 				fExpandButton->SetEnabled(true);
 				fExpandItem->SetEnabled(true);
 			}
-				
-			fShowContents->SetEnabled(true);
-			fShowItem->SetEnabled(true);
-			
+		
+			if (fShowContents->Value() == B_CONTROL_ON) {
+				StopListing(); 
+				StartListing();
+			} else {
+				fShowContents->SetEnabled(true);
+				fShowItem->SetEnabled(true);
+			}
+
 			bool fromApp;
 			if (msg->FindBool("fromApp", &fromApp)==B_OK) {
 				AutoExpand();