diff --git a/src/prefs/scrollbar/ScrollBarApp.cpp b/src/prefs/scrollbar/ScrollBarApp.cpp
index eb8e298833..5fd544ef8b 100644
--- a/src/prefs/scrollbar/ScrollBarApp.cpp
+++ b/src/prefs/scrollbar/ScrollBarApp.cpp
@@ -1,15 +1,17 @@
 #include <ScrollBarApp.h>
 #include <ScrollBarWindow.h>
 
+ScrollBarApp * scroll_bar_app = 0;
+
 ScrollBarApp::ScrollBarApp()
 	: BApplication("application/x-vnd.obos.scroll-bar")
 {
 	window = new ScrollBarWindow();
+	scroll_bar_app = this;
 }
 
 ScrollBarApp::~ScrollBarApp()
 {
-	delete window;
 }
 
 void
diff --git a/src/prefs/scrollbar/ScrollBarApp.h b/src/prefs/scrollbar/ScrollBarApp.h
index e906ae0e3e..1f46dacaae 100644
--- a/src/prefs/scrollbar/ScrollBarApp.h
+++ b/src/prefs/scrollbar/ScrollBarApp.h
@@ -15,4 +15,6 @@ class ScrollBarApp : public BApplication
 		ScrollBarWindow * window;
 };
 
+extern ScrollBarApp * scroll_bar_app;
+
 #endif // SCROLL_BAR_APP_H
diff --git a/src/prefs/scrollbar/ScrollBarWindow.cpp b/src/prefs/scrollbar/ScrollBarWindow.cpp
index be372bc5a8..f814bba5f4 100644
--- a/src/prefs/scrollbar/ScrollBarWindow.cpp
+++ b/src/prefs/scrollbar/ScrollBarWindow.cpp
@@ -4,8 +4,9 @@
 #include <Button.h>
 #include <StringView.h>
 #include <ScrollBarWindow.h>
+#include <ScrollBarApp.h>
 
-ScrollBarWindow::ScrollBarWindow() 
+ScrollBarWindow::ScrollBarWindow(void) 
 	: BWindow( BRect(50,50,398,325), "Scroll Bar", B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE )
 {
 	BBox* bigBox = new BBox( BRect(0,0,348,275), NULL, B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE_JUMP, B_PLAIN_BORDER );
@@ -73,6 +74,13 @@ ScrollBarWindow::ScrollBarWindow()
 	mainView->AddChild( revertButton );
 }
 
-ScrollBarWindow::~ScrollBarWindow()
+ScrollBarWindow::~ScrollBarWindow(void)
 {
 }
+
+bool
+ScrollBarWindow::QuitRequested(void)
+{
+	scroll_bar_app->PostMessage(B_QUIT_REQUESTED);
+	return true;
+}
diff --git a/src/prefs/scrollbar/ScrollBarWindow.h b/src/prefs/scrollbar/ScrollBarWindow.h
index 32bb97a3c7..9104baad40 100644
--- a/src/prefs/scrollbar/ScrollBarWindow.h
+++ b/src/prefs/scrollbar/ScrollBarWindow.h
@@ -5,8 +5,9 @@
 
 class ScrollBarWindow : public BWindow {
 public:
-	ScrollBarWindow();
-	virtual ~ScrollBarWindow();
+	ScrollBarWindow(void);
+	virtual ~ScrollBarWindow(void);
+	virtual bool QuitRequested(void);
 };
 
 #endif // SCROLL_BAR_WINDOW_H