diff --git a/source/net/sourceforge/filebot/ui/rename/MatchAction.java b/source/net/sourceforge/filebot/ui/rename/MatchAction.java
index ba303d5e..3175b4a9 100644
--- a/source/net/sourceforge/filebot/ui/rename/MatchAction.java
+++ b/source/net/sourceforge/filebot/ui/rename/MatchAction.java
@@ -1,6 +1,5 @@
 package net.sourceforge.filebot.ui.rename;
 
-import static net.sourceforge.filebot.ui.NotificationLogging.*;
 import static net.sourceforge.tuned.ui.TunedUtilities.*;
 
 import java.awt.Cursor;
@@ -40,12 +39,7 @@ class MatchAction extends AbstractAction {
 	}
 
 	public void actionPerformed(ActionEvent evt) {
-		if (model.files().isEmpty()) {
-			UILogger.info("Nothing to match. Please add some files and fetch data first.");
-			return;
-		}
-
-		if (model.names().isEmpty()) {
+		if (model.names().isEmpty() || model.files().isEmpty()) {
 			return;
 		}
 
diff --git a/source/net/sourceforge/filebot/ui/rename/RenamePanel.java b/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
index 11a41260..38ca66d8 100644
--- a/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
+++ b/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
@@ -211,7 +211,7 @@ public class RenamePanel extends JComponent {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				// show popup on actionPerformed only when names list is empty
-				if (renameModel.files().size() > 0 && renameModel.names().isEmpty()) {
+				if (renameModel.names().isEmpty()) {
 					fetchPopupAction.actionPerformed(e);
 				}
 			}