diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/NextOccurrenceAction.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/NextOccurrenceAction.java
index aa38ce2f5b1d..2128a0408def 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/NextOccurrenceAction.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/NextOccurrenceAction.java
@@ -36,7 +36,8 @@ public final class NextOccurrenceAction extends PrevNextOccurrenceAction {
 
   @Override
   public void actionPerformed(AnActionEvent e) {
-    e.getRequiredData(SearchSession.KEY).searchForward();
+    SearchSession session = e.getRequiredData(SearchSession.KEY);
+    if (session.hasMatches()) session.searchForward();
   }
 
   @NotNull
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/PrevNextOccurrenceAction.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/PrevNextOccurrenceAction.java
index 0e1e694faec5..891df512f8d0 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/PrevNextOccurrenceAction.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/PrevNextOccurrenceAction.java
@@ -35,7 +35,8 @@ public abstract class PrevNextOccurrenceAction extends DumbAwareAction implement
   @Override
   public final void update(AnActionEvent e) {
     SearchSession search = e.getData(SearchSession.KEY);
-    e.getPresentation().setEnabled(search != null && search.hasMatches());
+    boolean invokedByShortcut = !ActionPlaces.isToolbarPlace(e.getPlace());
+    e.getPresentation().setEnabled(search != null && (invokedByShortcut || search.hasMatches()));
   }
 
   @Nullable
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/PrevOccurrenceAction.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/PrevOccurrenceAction.java
index d39f9d5224bb..eb902ae3f9b1 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/PrevOccurrenceAction.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/PrevOccurrenceAction.java
@@ -39,7 +39,8 @@ public final class PrevOccurrenceAction extends PrevNextOccurrenceAction {
 
   @Override
   public void actionPerformed(AnActionEvent e) {
-    e.getRequiredData(SearchSession.KEY).searchBackward();
+    SearchSession session = e.getRequiredData(SearchSession.KEY);
+    if (session.hasMatches()) session.searchBackward();
   }
 
   @NotNull