Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 8820)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 8821)
@@ -249,8 +249,10 @@
         JCheckBox allElements = new JCheckBox(tr("all objects"), initialValues.allElements);
         allElements.setToolTipText(tr("Also include incomplete and deleted objects in search."));
-        final JCheckBox regexSearch = new JCheckBox(tr("regular expression"), initialValues.regexSearch);
-        final JCheckBox mapCSSSearch = new JCheckBox(tr("MapCSS selector"), initialValues.mapCSSSearch);
+        final JRadioButton standardSearch = new JRadioButton(tr("standard"), !initialValues.regexSearch && !initialValues.mapCSSSearch);
+        final JRadioButton regexSearch = new JRadioButton(tr("regular expression"), initialValues.regexSearch);
+        final JRadioButton mapCSSSearch = new JRadioButton(tr("MapCSS selector"), initialValues.mapCSSSearch);
         final JCheckBox addOnToolbar = new JCheckBox(tr("add toolbar button"), false);
         final ButtonGroup bg2 = new ButtonGroup();
+        bg2.add(standardSearch);
         bg2.add(regexSearch);
         bg2.add(mapCSSSearch);
@@ -267,7 +269,8 @@
         if (Main.pref.getBoolean("expert", false)) {
             left.add(allElements, GBC.eol());
+            left.add(addOnToolbar, GBC.eop());
+            left.add(standardSearch, GBC.eol());
             left.add(regexSearch, GBC.eol());
             left.add(mapCSSSearch, GBC.eol());
-            left.add(addOnToolbar, GBC.eol());
         }