diff --git a/rsrc/dialogs/help-debug.xml b/rsrc/dialogs/help-debug.xml
index 0f05f563..83562000 100644
--- a/rsrc/dialogs/help-debug.xml
+++ b/rsrc/dialogs/help-debug.xml
@@ -39,5 +39,10 @@
 	<button name='btn28' type='tiny' relative='pos-in pos' rel-anchor='prev' left='0' top='1'></button>
 	<button name='btn29' type='tiny' relative='pos-in pos' rel-anchor='prev' left='0' top='1'></button>
 	<button name='btn30' type='tiny' relative='pos-in pos' rel-anchor='prev' left='0' top='1'></button>
-	<button name='okay' type='regular' top='400' left='387'>OK</button>
+	<button name='btn31' type='tiny' relative='pos-in pos' rel-anchor='prev' left='0' top='1'></button>
+	<button name='btn32' type='tiny' relative='pos-in pos' rel-anchor='prev' left='0' top='1'></button>
+	<button name='btn33' type='tiny' relative='pos-in pos' rel-anchor='prev' left='0' top='1'></button>
+	<button name='btn34' type='tiny' relative='pos-in pos' rel-anchor='prev' left='0' top='1'></button>
+	<button name='btn35' type='tiny' relative='pos-in pos' rel-anchor='prev' left='0' top='1'></button>
+	<button name='okay' relative='pos-in neg' rel-anchor='prev' type='regular' top='5' left='337'>OK</button>
 </dialog>
diff --git a/src/game/boe.actions.cpp b/src/game/boe.actions.cpp
index d8113d25..af4a178c 100644
--- a/src/game/boe.actions.cpp
+++ b/src/game/boe.actions.cpp
@@ -2421,9 +2421,11 @@ void show_debug_help() {
 			});
 		}
 	}
-	for(; idx < 30; ++idx){
+	for(; ; ++idx){
 		std::ostringstream btn_name;
 		btn_name << "btn" << (idx+1);
+		if(!debug_panel.hasControl(btn_name.str()))
+			break;
 		cControl& button = debug_panel[btn_name.str()];
 		button.hide();
 	}