diff --git a/stella/src/emucore/EventHandler.cxx b/stella/src/emucore/EventHandler.cxx
index d8eb03478..a891e5a81 100644
--- a/stella/src/emucore/EventHandler.cxx
+++ b/stella/src/emucore/EventHandler.cxx
@@ -14,7 +14,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: EventHandler.cxx,v 1.205 2007-08-13 19:45:42 stephena Exp $
+// $Id: EventHandler.cxx,v 1.206 2007-08-15 19:14:49 stephena Exp $
 //============================================================================
 
 #include <sstream>
@@ -39,6 +39,7 @@
 #include "Serializer.hxx"
 #include "PropsSet.hxx"
 #include "Snapshot.hxx"
+#include "ScrollBarWidget.hxx"
 #include "bspf.hxx"
 
 #ifdef CHEATCODE_SUPPORT
@@ -155,6 +156,9 @@ void EventHandler::initialize()
   myGrabMouseFlag = myOSystem->settings().getBool("grabmouse");
   setPaddleMode(myOSystem->settings().getInt("paddle"), false);
   setPaddleThreshold(myOSystem->settings().getInt("pthresh"));
+
+  // Set number of lines a mousewheel will scroll
+  ScrollBarWidget::setWheelLines(myOSystem->settings().getInt("mwheel"));
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/stella/src/emucore/OSystem.cxx b/stella/src/emucore/OSystem.cxx
index 23c44c98b..6f77c901a 100644
--- a/stella/src/emucore/OSystem.cxx
+++ b/stella/src/emucore/OSystem.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: OSystem.cxx,v 1.106 2007-08-15 17:43:51 stephena Exp $
+// $Id: OSystem.cxx,v 1.107 2007-08-15 19:14:49 stephena Exp $
 //============================================================================
 
 #include <cassert>
@@ -46,7 +46,6 @@
 #include "bspf.hxx"
 #include "OSystem.hxx"
 #include "Widget.hxx"
-#include "ScrollBarWidget.hxx"
 
 #define MAX_ROM_SIZE  512 * 1024
 
@@ -184,9 +183,6 @@ bool OSystem::create()
   myDebugger = new Debugger(this);
 #endif
 
-  // Set number of lines a mousewheel will scroll
-  ScrollBarWidget::setWheelLines(mySettings->getInt("mwheel"));
-
   // Create the sound object; the sound subsystem isn't actually
   // opened until needed, so this is non-blocking (on those systems
   // that only have a single sound device (no hardware mixing)