diff --git a/source/net/sourceforge/filebot/ui/rename/RenamePanel.java b/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
index f3e2e794..fd623da1 100644
--- a/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
+++ b/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
@@ -336,6 +336,10 @@ public class RenamePanel extends JComponent {
 
 		@Override
 		public void actionPerformed(final ActionEvent evt) {
+			if (renameModel.files().isEmpty()) {
+				return;
+			}
+			
 			// auto-match in progress
 			namesList.firePropertyChange(LOADING_PROPERTY, false, true);