diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.cs
index a9d8b2e8..14e81c6d 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.cs
@@ -131,6 +131,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 		{
 			if (e.Key == KeyboardKey.Enter)
 			{
+				e.Cancel = true;
 				if (lv.SelectedRows.Count != 1) return;
 				
 				SelectedObject = lv.SelectedRows[0].GetExtraData<TRef>("TRef")?.Create();
@@ -140,8 +141,10 @@ namespace UniversalEditor.UserInterface.Dialogs
 			}
 			else if (e.Key == KeyboardKey.Escape)
 			{
+				e.Cancel = true;
+
 				// already handled by GTK? but what about other platforms
-				// Close();
+				Close();
 			}
 		}