diff --git a/components/interface/FocusTerm.js b/components/interface/FocusTerm.js
index 438ef1b84..49f2de520 100644
--- a/components/interface/FocusTerm.js
+++ b/components/interface/FocusTerm.js
@@ -151,6 +151,23 @@ export default class FocusTerm extends React.Component {
                 );
               }
             });
+          } else {
+            var variable = GEPPETTO.ModelFactory.getTopLevelVariablesById([classId])[0]
+            var allQueries = GEPPETTO.ModelFactory.getMatchingQueries(variable.getType(), undefined);
+            if (allQueries.length > 0) {
+              focusSubMenu.push(
+                {
+                  label: "Search for",
+                  icon: "",
+                  action: "",
+                  position: "left",
+                  dynamicListInjector: {
+                    handlerAction: "subMenuGrouping",
+                    parameters: [{ variable: variable, allQueries: allQueries }]
+                  }
+                }
+              );
+            }
           }
         }
       }