diff --git a/pcbnew/dialogs/dialog_find.cpp b/pcbnew/dialogs/dialog_find.cpp
index 9af1b732eb..1c37529c2c 100644
--- a/pcbnew/dialogs/dialog_find.cpp
+++ b/pcbnew/dialogs/dialog_find.cpp
@@ -398,7 +398,7 @@ void DIALOG_FIND::search( bool aDirection )
 
         m_status->SetLabel( msg );
     }
-    else if( endIsReached )
+    else if( endIsReached || m_it == m_hitList.end() )
     {
         m_frame->SetStatusText( wxEmptyString );
         m_frame->ShowInfoBarMsg( _( "No more items to show" ) );