diff --git a/extra/jheidi/queryToolbarEvents.ajl b/extra/jheidi/queryToolbarEvents.ajl
index 2962d7d5..af9a6a19 100644
--- a/extra/jheidi/queryToolbarEvents.ajl
+++ b/extra/jheidi/queryToolbarEvents.ajl
@@ -82,7 +82,7 @@ else if ("Search".equals(who))
 {
   Frame f = context.get("/");
   String txt = f.popupQuestion("Search", "Enter text to search for:");
-  if (txt != null)
+  if (txt != null && txt.trim().length()>0)
   {
      args().put("searchText", txt);
      script("searchText", args());