diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index 35945f2b0..7e4a5197b 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -120,7 +120,7 @@ public:
     rightClickBehavior()->setSelectedItemIndex((int)m_settings->getRightClickMode());
 
     // Zoom with Scroll Wheel
-    wheelZoom()->setSelected(m_settings->getZoomWithScrollWheel());
+    wheelZoom()->setSelected(m_preferences.editor.zoomWithWheel());
 
     // Checked background size
     checkedBgSize()->addItem("16x16");
@@ -178,7 +178,7 @@ public:
     m_preferences.editor.zoomFromCenterWithWheel(zoomFromCenterWithWheel()->isSelected());
     m_preferences.editor.zoomFromCenterWithKeys(zoomFromCenterWithKeys()->isSelected());
     m_settings->setShowSpriteEditorScrollbars(showScrollbars()->isSelected());
-    m_settings->setZoomWithScrollWheel(wheelZoom()->isSelected());
+    m_preferences.editor.zoomWithWheel(wheelZoom()->isSelected());
     m_settings->setRightClickMode(static_cast<RightClickMode>(rightClickBehavior()->getSelectedItemIndex()));
 
     m_curPref->grid.color(m_gridColor->getColor());
diff --git a/src/app/settings/settings.h b/src/app/settings/settings.h
index 8e7227df9..ca611d077 100644
--- a/src/app/settings/settings.h
+++ b/src/app/settings/settings.h
@@ -44,7 +44,6 @@ namespace app {
     virtual ~ISettings() { }
 
     // General settings
-    virtual bool getZoomWithScrollWheel() = 0;
     virtual bool getCenterOnZoom() = 0;
     virtual bool getShowSpriteEditorScrollbars() = 0;
     virtual RightClickMode getRightClickMode() = 0;
@@ -55,7 +54,6 @@ namespace app {
     virtual tools::Tool* getCurrentTool() = 0;
     virtual app::ColorSwatches* getColorSwatches() = 0;
 
-    virtual void setZoomWithScrollWheel(bool state) = 0;
     virtual void setCenterOnZoom(bool state) = 0;
     virtual void setShowSpriteEditorScrollbars(bool state) = 0;
     virtual void setRightClickMode(RightClickMode mode) = 0;
diff --git a/src/app/settings/ui_settings_impl.cpp b/src/app/settings/ui_settings_impl.cpp
index a5848cf61..08825b290 100644
--- a/src/app/settings/ui_settings_impl.cpp
+++ b/src/app/settings/ui_settings_impl.cpp
@@ -78,7 +78,6 @@ UISettingsImpl::UISettingsImpl()
   : m_currentTool(NULL)
   , m_colorSwatches(NULL)
   , m_selectionSettings(new UISelectionSettingsImpl)
-  , m_zoomWithScrollWheel(get_config_bool("Options", "ZoomWithMouseWheel", true))
   , m_centerOnZoom(get_config_bool("Editor", "CenterOnZoom", false))
   , m_showSpriteEditorScrollbars(get_config_bool("Options", "ShowScrollbars", true))
   , m_grabAlpha(get_config_bool("Options", "GrabAlpha", false))
@@ -95,7 +94,6 @@ UISettingsImpl::UISettingsImpl()
 
 UISettingsImpl::~UISettingsImpl()
 {
-  set_config_bool("Options", "ZoomWithMouseWheel", m_zoomWithScrollWheel);
   set_config_bool("Editor", "CenterOnZoom", m_centerOnZoom);
   set_config_bool("Options", "ShowScrollbars", m_showSpriteEditorScrollbars);
   set_config_bool("Options", "GrabAlpha", m_grabAlpha);
@@ -112,11 +110,6 @@ UISettingsImpl::~UISettingsImpl()
 //////////////////////////////////////////////////////////////////////
 // General settings
 
-bool UISettingsImpl::getZoomWithScrollWheel()
-{
-  return m_zoomWithScrollWheel;
-}
-
 bool UISettingsImpl::getCenterOnZoom()
 {
   return m_centerOnZoom;
@@ -167,11 +160,6 @@ app::ColorSwatches* UISettingsImpl::getColorSwatches()
   return m_colorSwatches;
 }
 
-void UISettingsImpl::setZoomWithScrollWheel(bool state)
-{
-  m_zoomWithScrollWheel = state;
-}
-
 void UISettingsImpl::setCenterOnZoom(bool state)
 {
   m_centerOnZoom = state;
diff --git a/src/app/settings/ui_settings_impl.h b/src/app/settings/ui_settings_impl.h
index 743c170b6..68f04ae9b 100644
--- a/src/app/settings/ui_settings_impl.h
+++ b/src/app/settings/ui_settings_impl.h
@@ -30,7 +30,6 @@ namespace app {
     ~UISettingsImpl();
 
     // ISettings implementation
-    bool getZoomWithScrollWheel() override;
     bool getCenterOnZoom() override;
     bool getShowSpriteEditorScrollbars() override;
     RightClickMode getRightClickMode() override;
@@ -41,7 +40,6 @@ namespace app {
     tools::Tool* getCurrentTool() override;
     app::ColorSwatches* getColorSwatches() override;
 
-    void setZoomWithScrollWheel(bool state) override;
     void setCenterOnZoom(bool state) override;
     void setShowSpriteEditorScrollbars(bool state) override;
     void setRightClickMode(RightClickMode mode) override;
@@ -71,7 +69,6 @@ namespace app {
     app::ColorSwatches* m_colorSwatches;
     std::vector<app::ColorSwatches*> m_colorSwatchesStore;
     base::UniquePtr<ISelectionSettings> m_selectionSettings;
-    bool m_zoomWithScrollWheel;
     bool m_centerOnZoom;
     bool m_showSpriteEditorScrollbars;
     bool m_grabAlpha;
diff --git a/src/app/ui/editor/state_with_wheel_behavior.cpp b/src/app/ui/editor/state_with_wheel_behavior.cpp
index 85ba33d76..03f95305d 100644
--- a/src/app/ui/editor/state_with_wheel_behavior.cpp
+++ b/src/app/ui/editor/state_with_wheel_behavior.cpp
@@ -46,7 +46,7 @@ bool StateWithWheelBehavior::onMouseWheel(Editor* editor, MouseMessage* msg)
       wheelAction = WHEEL_FG;
   }
   // Normal behavior: mouse wheel zooms
-  else if (UIContext::instance()->settings()->getZoomWithScrollWheel()) {
+  else if (App::instance()->preferences().editor.zoomWithWheel()) {
     if (msg->ctrlPressed())
       wheelAction = WHEEL_FRAME;
     else if (msg->wheelDelta().x != 0 || msg->shiftPressed())