Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java	(revision 9444)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java	(revision 9445)
@@ -36,5 +36,5 @@
          */
         public Action() {
-            super(tr("Search for objects by preset"), "dialogs/search", tr("Show preset search dialog"),
+            super(tr("Search for objects by preset..."), "dialogs/search", tr("Show preset search dialog"),
                     Shortcut.registerShortcut("preset:search-objects", tr("Search for objects by preset"), KeyEvent.VK_F3, Shortcut.SHIFT),
                     false);
@@ -48,4 +48,9 @@
                 TaggingPresetSearchPrimitiveDialog.getInstance().showDialog();
             }
+        }
+
+        @Override
+        protected void updateEnabledState() {
+            setEnabled(getEditLayer() != null);
         }
     }