diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp
index bd965a2b0..51a9759e4 100644
--- a/src/game/editor/editor.cpp
+++ b/src/game/editor/editor.cpp
@@ -1196,7 +1196,7 @@ void CEditor::DoToolbar(CUIRect ToolBar)
 		if(DoButton_Ex(&s_SpeedupButton, "Speedup", (pS && pS->m_Speedup)?0:-1, &Button, 0, "Speedup", CUI::CORNER_ALL))
 		{
 			static int s_SpeedupPopupID = 0;
-			UiInvokePopupMenu(&s_SpeedupPopupID, 0, UI()->MouseX(), UI()->MouseY(), 120, 53, PopupSpeedup);
+			UiInvokePopupMenu(&s_SpeedupPopupID, 0, UI()->MouseX(), UI()->MouseY(), 120, 48, PopupSpeedup);
 		}
 		// do switch button
 		TB_Bottom.VSplitLeft(5.0f, &Button, &TB_Bottom);
@@ -1214,7 +1214,7 @@ void CEditor::DoToolbar(CUIRect ToolBar)
 		if(DoButton_Ex(&s_TuneButton, "Tune", (pS && pS->m_Tune)?0:-1, &Button, 0, "Tune", CUI::CORNER_ALL))
 		{
 			static int s_TunePopupID = 0;
-			UiInvokePopupMenu(&s_TunePopupID, 0, UI()->MouseX(), UI()->MouseY(), 120, 90, PopupTune);
+			UiInvokePopupMenu(&s_TunePopupID, 0, UI()->MouseX(), UI()->MouseY(), 120, 23, PopupTune);
 		}
 	}
 
diff --git a/src/game/editor/popups.cpp b/src/game/editor/popups.cpp
index 0690029d5..61ae7d4d3 100644
--- a/src/game/editor/popups.cpp
+++ b/src/game/editor/popups.cpp
@@ -1470,14 +1470,14 @@ int CEditor::PopupSwitch(CEditor *pEditor, CUIRect View)
 
 	enum
 	{
-		PROP_SwitchNumber=0,
-		PROP_SwitchDelay,
+		PROP_SwitchDelay=0,
+		PROP_SwitchNumber,
 		NUM_PROPS,
 	};
 
 	CProperty aProps[] = {
-		{"Number", pEditor->m_SwitchNum, PROPTYPE_INT_STEP, 0, 255},
 		{"Delay", pEditor->m_SwitchDelay, PROPTYPE_INT_STEP, 0, 255},
+		{"Number", pEditor->m_SwitchNum, PROPTYPE_INT_STEP, 0, 255},
 		{0},
 	};