diff --git a/ide/genericlistselect.pas b/ide/genericlistselect.pas
index dbfee864e6..e7a441a9ad 100644
--- a/ide/genericlistselect.pas
+++ b/ide/genericlistselect.pas
@@ -58,8 +58,8 @@ end;
 
 procedure TGenericListSelectForm.ListBoxDblClick(Sender: TObject);
 begin
-  UpdateButtons;
-  ModalResult:=mrOK;
+  if ListBox.ItemIndex > -1 then
+    ModalResult:=mrOK;
 end;
 
 procedure TGenericListSelectForm.UpdateButtons;