diff --git a/haiku/main.cpp b/haiku/main.cpp
index 2f3c1763..e341913b 100644
--- a/haiku/main.cpp
+++ b/haiku/main.cpp
@@ -39,5 +39,6 @@ void uiMain(void)
 
 void uiQuit(void)
 {
+	// TODO app->PostMessage(B_QUIT_REQUESTED);?
 	app->Quit();
 }
diff --git a/haiku/window.cpp b/haiku/window.cpp
index 98fa2996..b45f12c3 100644
--- a/haiku/window.cpp
+++ b/haiku/window.cpp
@@ -56,7 +56,7 @@ static void windowCommitDestroy(uiControl *c)
 		singleChildDestroy(w->child);
 	// and finally destroy ourselves
 	// this is why we don't use the libui-provided CommitDestroy() implementation
-	// TODO check this for errors?
+	// TODO check this for errors? or use B_QUIT_REQUESTED?
 	w->window->Lock();
 	w->window->Quit();
 	// w->window is now destroyed for us