diff --git a/searchwindow.cpp b/searchwindow.cpp
index 40db906b5..068ab41c4 100644
--- a/searchwindow.cpp
+++ b/searchwindow.cpp
@@ -656,14 +656,16 @@ void SearchWindow::renameSearchFolder()
       ++i;
     }
   }
-  mSearchFolderOpenBtn->setEnabled(true);
+  if ( mFolder )
+    mSearchFolderOpenBtn->setEnabled( true );
 }
 
 void SearchWindow::openSearchFolder()
 {
-    renameSearchFolder();
-    mKMMainWidget->slotSelectFolder( mFolder->folder() );
-    slotClose();
+  Q_ASSERT( mFolder );
+  renameSearchFolder();
+  mKMMainWidget->slotSelectFolder( mFolder->folder() );
+  slotClose();
 }
 
 //-----------------------------------------------------------------------------