diff --git a/src/net/azib/ipscan/gui/EditFavoritesDialog.java b/src/net/azib/ipscan/gui/EditFavoritesDialog.java
index 113ab900..e869d941 100644
--- a/src/net/azib/ipscan/gui/EditFavoritesDialog.java
+++ b/src/net/azib/ipscan/gui/EditFavoritesDialog.java
@@ -96,7 +96,9 @@ public class EditFavoritesDialog extends AbstractModalDialog {
 
 	class RenameListener implements Listener {
 		public void handleEvent(Event event) {
-			int index = favoritesList.getSelectionIndex();
+			if (favoritesConfig.size() == 0) return;
+			int index = Math.max(favoritesList.getSelectionIndex(), 0);
+
 			InputDialog prompt = new InputDialog(Labels.getLabel("title.rename"), "");
 			String oldName = favoritesList.getItem(index);
 			String newName = prompt.open(oldName);