diff --git a/eeschema/widgets/search_handlers.cpp b/eeschema/widgets/search_handlers.cpp
index 79f50e5cf9..afd617b706 100644
--- a/eeschema/widgets/search_handlers.cpp
+++ b/eeschema/widgets/search_handlers.cpp
@@ -175,6 +175,7 @@ int SYMBOL_SEARCH_HANDLER::Search( const wxString& aQuery )
     m_hitlist.clear();
 
     SCH_SEARCH_DATA frp;
+    frp.searchAllFields = true;
     frp.findString = aQuery;
 
     // Try to handle whatever the user throws at us (substring, wildcards, regex, etc.)
@@ -256,6 +257,7 @@ int POWER_SEARCH_HANDLER::Search( const wxString& aQuery )
     m_hitlist.clear();
 
     SCH_SEARCH_DATA frp;
+    frp.searchAllFields = true;
     frp.findString = aQuery;
 
     // Try to handle whatever the user throws at us (substring, wildcards, regex, etc.)
@@ -327,6 +329,7 @@ int TEXT_SEARCH_HANDLER::Search( const wxString& aQuery )
     m_hitlist.clear();
 
     SCH_SEARCH_DATA frp;
+    frp.searchAllFields = true;
     frp.findString = aQuery;
 
     // Try to handle whatever the user throws at us (substring, wildcards, regex, etc.)
@@ -411,6 +414,7 @@ int LABEL_SEARCH_HANDLER::Search( const wxString& aQuery )
     m_hitlist.clear();
 
     SCH_SEARCH_DATA frp;
+    frp.searchAllFields = true;
     frp.findString = aQuery;
 
     // Try to handle whatever the user throws at us (substring, wildcards, regex, etc.)