--- /home2/moin/MoinMoin/action/fullsearch.py	2012-02-07 21:48:50.000000000 +0100
+++ fullsearch.py	2012-03-19 21:17:45.000000000 +0100
@@ -162,9 +162,9 @@
 
     # check for sensible search term
     stripped = needle.strip()
-    if len(stripped) == 0:
-        request.theme.add_msg(_('Please use a more selective search term instead '
-                'of {{{"%s"}}}', wiki=True) % wikiutil.escape(needle), "error")
+    lstripped = stripped.lower()
+    if (len(lstripped) < 3) or ('regex:' in lstripped) or ('r:' in lstripped) or ('*' in lstripped):
+        request.theme.add_msg(_('Please use a more selective search term instead of {{{"%s"}}}', wiki=True) % wikiutil.escape(needle), "error")
         Page(request, pagename).send_page()
         return
     needle = stripped