diff --git a/src/apps/haiku3d/MainWindow.cpp b/src/apps/haiku3d/MainWindow.cpp
index a1a6315..ef4a198 100644
--- a/src/apps/haiku3d/MainWindow.cpp
+++ b/src/apps/haiku3d/MainWindow.cpp
@@ -35,6 +35,9 @@ MainWindow::~MainWindow()
 bool
 MainWindow::QuitRequested()
 {
+       if (fRenderView != NULL)
+               fRenderView->EnableDirectMode(false);
+
        be_app->PostMessage(B_QUIT_REQUESTED);
        return true;
 }
@@ -53,5 +56,8 @@ MainWindow::MessageReceived(BMessage* message)
 void
 MainWindow::DirectConnected(direct_buffer_info* info)
 {
-       fRenderView->DirectConnected(info);
+       if (fRenderView != NULL) {
+               fRenderView->DirectConnected(info);
+               fRenderView->EnableDirectMode(true);
+       }
 }