diff --git a/src/openbox.cc b/src/openbox.cc
index 1af59c25..4aac9ba5 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -71,7 +71,8 @@ void Openbox::signalHandler(int signal)
   case SIGTERM:
   case SIGPIPE:
     printf("Caught signal %d. Exiting.", signal);
-    // XXX: Make Openbox exit
+    instance->shutdown();
+
     break;
   case SIGFPE:
   case SIGSEGV: