diff --git a/src/game/editor/popups.cpp b/src/game/editor/popups.cpp
index 6a94d8426..b76251b31 100644
--- a/src/game/editor/popups.cpp
+++ b/src/game/editor/popups.cpp
@@ -1445,7 +1445,8 @@ int CEditor::PopupTele(CEditor *pEditor, CUIRect View, void *pContext)
 	Button.VSplitRight(2.f, &Button, 0);
 
 	static int emptySlotPid = 0;
-	if (pEditor->DoButton_Editor(&emptySlotPid, "F", 0, &FindEmptySlot, 0, "Find empty slot"))
+	if (pEditor->DoButton_Editor(&emptySlotPid, "F", 0, &FindEmptySlot, 0, "Find empty slot")
+		|| pEditor->Input()->KeyPress(KEY_F))
 	{
 		int number = -1;
 		for(int i = 1; i <= 255; i++)