diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 6f1cfb34b74..26fdfe0c5ac 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -60,6 +60,7 @@
 import org.jabref.gui.documentviewer.ShowDocumentViewerAction;
 import org.jabref.gui.duplicationFinder.DuplicateSearch;
 import org.jabref.gui.edit.CopyMoreAction;
+import org.jabref.gui.edit.EditAction;
 import org.jabref.gui.edit.ManageKeywordsAction;
 import org.jabref.gui.edit.MassSetFieldsAction;
 import org.jabref.gui.edit.OpenBrowserAction;
@@ -777,7 +778,7 @@ private MenuBar createMenu() {
         lookup.getItems().addAll(
                 factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this, dialogService, stateManager))
         );
-        
+
         // PushToApplication
         final PushToApplicationAction pushToApplicationAction = pushToApplicationsManager.getPushToApplicationAction();
         final MenuItem pushToApplicationMenuItem = factory.createMenuItem(pushToApplicationAction.getActionInformation(), pushToApplicationAction);
diff --git a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
index 6ee6db5c95f..c2bb13170d0 100644
--- a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
+++ b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
@@ -69,6 +69,7 @@ public void execute() {
                 break;
             default:
                 LOGGER.info("Unknown copy command.");
+                break;
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/EditAction.java b/src/main/java/org/jabref/gui/edit/EditAction.java
similarity index 92%
rename from src/main/java/org/jabref/gui/EditAction.java
rename to src/main/java/org/jabref/gui/edit/EditAction.java
index 52e9a878f2a..e48add2b08c 100644
--- a/src/main/java/org/jabref/gui/EditAction.java
+++ b/src/main/java/org/jabref/gui/edit/EditAction.java
@@ -1,7 +1,10 @@
-package org.jabref.gui;
+package org.jabref.gui.edit;
 
 import javafx.scene.control.TextInputControl;
 
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
 
@@ -19,6 +22,8 @@ public EditAction(StandardActions action, JabRefFrame frame, StateManager stateM
             this.action = action;
             this.frame = frame;
             this.stateManager = stateManager;
+
+            this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
         }
 
         @Override
diff --git a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
index 441c1698ed4..afc0b8d4195 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -7,7 +7,7 @@
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.EditAction;
+import org.jabref.gui.edit.EditAction;
 import org.jabref.gui.SendAsEMailAction;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;