diff --git a/src/video/X11.cpp b/src/video/X11.cpp
index 56902a194..28b235263 100644
--- a/src/video/X11.cpp
+++ b/src/video/X11.cpp
@@ -511,6 +511,7 @@ local void X11HandleKey(KeySym code)
     if( HandleKeyDown(icode) ) {
 	return;
     }
+    // FIXME: Should come first
     DoButtonPanelKey(icode);
 }
 
diff --git a/src/video/sdl.cpp b/src/video/sdl.cpp
index bc1029665..178e00814 100644
--- a/src/video/sdl.cpp
+++ b/src/video/sdl.cpp
@@ -348,6 +348,7 @@ local void SdlHandleKey(const SDL_keysym* code)
     if( HandleKeyDown(icode) ) {
 	return;
     }
+    // FIXME: Should come first
     DoButtonPanelKey(icode);
 }
 
diff --git a/src/video/svgalib.cpp b/src/video/svgalib.cpp
index 21bcce90b..e2ea098aa 100644
--- a/src/video/svgalib.cpp
+++ b/src/video/svgalib.cpp
@@ -618,6 +618,7 @@ local void KeyboardEvent(int scancode, int press) {
 	if(HandleKeyDown(icode)) {
 	    return;
 	}
+	// FIXME: Should come first
 	DoButtonPanelKey(icode);
     } else if(press == KEY_EVENTRELEASE) {
 	switch(scancode) {