diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index b0749d4bdf..6152efaa98 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -71,7 +71,7 @@ namespace MWGui
         , mUpdateTimer(0.f)
     {
         float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-        if (uiScale > 1.0)
+        if (uiScale > 0.f)
             mScaleFactor = uiScale;
 
         mPreviewTexture.reset(new osgMyGUI::OSGTexture(mPreview->getTexture()));
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 48091541ca..d17a4bd95d 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -70,7 +70,7 @@ namespace MWInput
         }
 
         float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-        if (uiScale != 0.f)
+        if (uiScale > 0.f)
             mInvUiScalingFactor = 1.f / uiScale;
 
         float deadZoneRadius = Settings::Manager::getFloat("joystick dead zone", "Input");
diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp
index 4816470ffb..8df116baa6 100644
--- a/apps/openmw/mwinput/mousemanager.cpp
+++ b/apps/openmw/mwinput/mousemanager.cpp
@@ -37,7 +37,7 @@ namespace MWInput
         , mGuiCursorEnabled(true)
     {
         float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-        if (uiScale != 0.f)
+        if (uiScale > 0.f)
             mInvUiScalingFactor = 1.f / uiScale;
 
         int w,h;
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 64931aa880..25d859e547 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -90,7 +90,7 @@ LocalMap::LocalMap(osg::Group* root)
 {
     // Increase map resolution, if use UI scaling
     float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-    if (uiScale > 1.0)
+    if (uiScale > 0.f)
         mMapResolution *= uiScale;
 
     SceneUtil::FindByNameVisitor find("Scene Root");
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index 2bed079e17..98fce32d2a 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -569,7 +569,8 @@ namespace Gui
                 resolution = std::min(960, std::max(48, resolution));
 
                 float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-                resolution *= uiScale;
+                if (uiScale > 0.f)
+                    resolution *= uiScale;
 
                 MyGUI::xml::ElementPtr resolutionNode = resourceNode->createChild("Property");
                 resolutionNode->addAttribute("key", "Resolution");