diff --git a/plugins/org.jkiss.dbeaver.ui.app.standalone/plugin.xml b/plugins/org.jkiss.dbeaver.ui.app.standalone/plugin.xml
index 78014373b33105b2fd9186f7ed71c0d01d285f88..a633782333f92af61b15a1161f63e0cacf87c84a 100644
--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/plugin.xml
@@ -161,11 +161,15 @@
             <command commandId="org.eclipse.ui.edit.redo" label="%command.org.jkiss.dbeaver.core.edit.redo.name"/>
             <command commandId="org.eclipse.ui.edit.cut" label="%command.org.jkiss.dbeaver.core.edit.cut.name"/>
             <command commandId="org.eclipse.ui.edit.copy" label="%command.org.jkiss.dbeaver.core.edit.copy.name"/>
-            <command commandId="org.jkiss.dbeaver.core.edit.copy.special" label="%command.org.jkiss.dbeaver.core.edit.copy.special.name"/>
+            <command commandId="org.jkiss.dbeaver.core.edit.copy.special" label="%command.org.jkiss.dbeaver.core.edit.copy.special.name">
+                <visibleWhen checkEnabled="true"/>
+            </command>
             <command commandId="org.eclipse.ui.edit.paste" label="%command.org.jkiss.dbeaver.core.edit.paste.name"/>
             <command commandId="org.eclipse.ui.edit.delete" label="%command.org.jkiss.dbeaver.core.edit.delete.name"/>
             <separator name="find.ext" visible="true"/>
-            <command commandId="org.eclipse.ui.edit.findReplace" label="%command.org.jkiss.dbeaver.core.edit.findreplace.name"/>
+            <command commandId="org.eclipse.ui.edit.findReplace" label="%command.org.jkiss.dbeaver.core.edit.findreplace.name">
+                <visibleWhen checkEnabled="true"/>
+            </command>
             <command commandId="org.jkiss.dbeaver.core.navigator.bookmark.add"/>
             <separator name="additions" visible="true"/>
             <separator name="format" visible="true"/>
diff --git a/plugins/org.jkiss.dbeaver.ui.app.standalone/src/org/jkiss/dbeaver/ui/app/standalone/ApplicationActionBarAdvisor.java b/plugins/org.jkiss.dbeaver.ui.app.standalone/src/org/jkiss/dbeaver/ui/app/standalone/ApplicationActionBarAdvisor.java
index bb5898b61f220a592756b551404ca4c5869fbd8f..f0a5826ccdc9d1f1ccd2deb24eefd95bbe582ff0 100644
--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/src/org/jkiss/dbeaver/ui/app/standalone/ApplicationActionBarAdvisor.java
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/src/org/jkiss/dbeaver/ui/app/standalone/ApplicationActionBarAdvisor.java
@@ -118,23 +118,29 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor
         for (IConfigurationElement searchActionItem : actionSet.getConfigurationElement().getChildren()) {
             String saId = searchActionItem.getAttribute("id");
             if ("org.eclipse.search.OpenSearchDialog".equals(saId) || "org.eclipse.search.OpenSearchDialogPage".equals(saId)) {
-                try {
-                    Object cfgElement = BeanUtils.invokeObjectDeclaredMethod(searchActionItem, "getConfigurationElement", new Class[0], new Object[0]);
-                    if (cfgElement  != null) {
-                        Field pavField = cfgElement.getClass().getDeclaredField("propertiesAndValue");
-                        pavField.setAccessible(true);
-                        String[] pav = (String[]) pavField.get(cfgElement);
-                        for (int i = 0; i < pav.length; i += 2) {
-                            if (pav[i].equals("icon")) {
-                                pav[i + 1] = "platform:/plugin/" + CoreApplicationActivator.PLUGIN_ID + "/icons/eclipse/search.png";
-                            }
-                        }
+                patchActionSetIcon(searchActionItem, "platform:/plugin/" + CoreApplicationActivator.PLUGIN_ID + "/icons/eclipse/search.png");
+            } else if ("org.eclipse.search.OpenFileSearchPage".equals(saId)) {
+                patchActionSetIcon(searchActionItem, UIIcon.FIND_TEXT.getLocation());
+            }
+        }
+    }
+
+    private void patchActionSetIcon(IConfigurationElement searchActionItem, String iconPath) {
+        try {
+            Object cfgElement = BeanUtils.invokeObjectDeclaredMethod(searchActionItem, "getConfigurationElement", new Class[0], new Object[0]);
+            if (cfgElement  != null) {
+                Field pavField = cfgElement.getClass().getDeclaredField("propertiesAndValue");
+                pavField.setAccessible(true);
+                String[] pav = (String[]) pavField.get(cfgElement);
+                for (int i = 0; i < pav.length; i += 2) {
+                    if (pav[i].equals("icon")) {
+                        pav[i + 1] = iconPath;
                     }
-                } catch (Throwable e) {
-                    // ignore
-                    log.debug("Failed to patch search actions", e);
                 }
             }
+        } catch (Throwable e) {
+            // ignore
+            log.debug("Failed to patch search actions", e);
         }
     }