diff --git a/haiku/main.cpp b/haiku/main.cpp
index 3e2bfdae..9d2e4eb3 100644
--- a/haiku/main.cpp
+++ b/haiku/main.cpp
@@ -41,5 +41,6 @@ void uiMain(void)
 void uiQuit(void)
 {
 	// TODO app->PostMessage(B_QUIT_REQUESTED);?
+	// TODO see window.cpp for why that alone won't work
 	app->Quit();
 }
diff --git a/haiku/window.cpp b/haiku/window.cpp
index 4938229a..7ec6496a 100644
--- a/haiku/window.cpp
+++ b/haiku/window.cpp
@@ -3,6 +3,10 @@
 #include "uipriv_haiku.hpp"
 using namespace std;
 
+// TODOs:
+// - Command+Q invariably quits; override that by catching the B_QUIT_REQUESTED in main.cpp
+// - other global shortcuts that need to be handled by overriding DispatchMessage() (NOT MessageReceived()) when adding uiArea event handling
+
 class libuiBWindow : public BWindow {
 public:
 	// C++11! Inherit constructors.