diff --git a/pcbnew/dialogs/dialog_find.cpp b/pcbnew/dialogs/dialog_find.cpp
index 4285dd8e1c..ccfae7fc6f 100644
--- a/pcbnew/dialogs/dialog_find.cpp
+++ b/pcbnew/dialogs/dialog_find.cpp
@@ -129,8 +129,15 @@ void DIALOG_FIND::search( bool aDirection )
     bool        endIsReached = false;
     bool        isFirstSearch = false;
 
-    // Add/move the search string to the top of the list if it isn't already there
     searchString = m_searchCombo->GetValue();
+
+    if( searchString.IsEmpty() )
+    {
+        Show();
+        return;
+    }
+
+    // Add/move the search string to the top of the list if it isn't already there
     index = m_searchCombo->FindString( searchString, true );
 
     if( index == wxNOT_FOUND )