diff --git a/eeschema/symbol_viewer_frame.cpp b/eeschema/symbol_viewer_frame.cpp
index 0a34b6f43e..2e801b0c61 100644
--- a/eeschema/symbol_viewer_frame.cpp
+++ b/eeschema/symbol_viewer_frame.cpp
@@ -1055,7 +1055,7 @@ void SYMBOL_VIEWER_FRAME::onSelectNextSymbol( wxCommandEvent& aEvent )
     int            ii = m_symbolList->GetSelection();
 
     // Select the next symbol or stop at the end of the list.
-    if( ii != wxNOT_FOUND || ii != (int) m_symbolList->GetCount() - 1 )
+    if( ii != wxNOT_FOUND && ii < (int)(m_symbolList->GetCount() - 1) )
         ii += 1;
 
     m_symbolList->SetSelection( ii );