diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 98d86e5ae..f1dd18acc 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -2,6 +2,7 @@
 
 #include <components/esm/loadligh.hpp>
 #include <components/esm/objectstate.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -169,7 +170,8 @@ namespace MWClass
 
         std::string text;
 
-	text += "\n#{sDuration}: " + MWGui::ToolTips::toString(ptr.getClass().getRemainingUsageTime(ptr));
+        if (Settings::Manager::getBool("show effect duration","Game"))
+            text += "\n#{sDuration}: " + MWGui::ToolTips::toString(ptr.getClass().getRemainingUsageTime(ptr));
         if (ref->mBase->mData.mWeight != 0)
         {
             text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index 632baeb19..27896381e 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -6,6 +6,7 @@
 #include <MyGUI_ImageBox.h>
 
 #include <components/esm/loadmgef.hpp>
+#include <components/settings/settings.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
@@ -134,23 +135,24 @@ namespace MWGui
                             MWBase::Environment::get().getWindowManager()->getGameSettingString("spoint", "") );
                     }
                 }
-		if (effectIt->mRemainingTime > -1) {
-		    sourcesDescription += " #{sDuration}: ";
-		    float duration = effectIt->mRemainingTime;
-		    if (duration > 3600) {
-			int hour = duration / 3600;
-			duration -= hour*3600;
-			sourcesDescription += MWGui::ToolTips::toString(hour) + "h";
-		    }
-		    if (duration > 60) {
-			int minute = duration / 60;
-			duration -= minute*60;
-			sourcesDescription += MWGui::ToolTips::toString(minute) + "m";
-		    }
-		    if (duration > 0.1) {
-			sourcesDescription += MWGui::ToolTips::toString(duration) + "s";
-		    }
-		}
+                if (effectIt->mRemainingTime > -1 &&
+                        Settings::Manager::getBool("show effect duration","Game")) {
+                    sourcesDescription += " #{sDuration}: ";
+                    float duration = effectIt->mRemainingTime;
+                    if (duration > 3600) {
+                        int hour = duration / 3600;
+                        duration -= hour*3600;
+                        sourcesDescription += MWGui::ToolTips::toString(hour) + "h";
+                    }
+                    if (duration > 60) {
+                        int minute = duration / 60;
+                        duration -= minute*60;
+                        sourcesDescription += MWGui::ToolTips::toString(minute) + "m";
+                    }
+                    if (duration > 0.1) {
+                        sourcesDescription += MWGui::ToolTips::toString(duration) + "s";
+                    }
+                }
             }
 
             if (remainingDuration > 0.f)
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c793225c2..274a31315 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -175,6 +175,8 @@ difficulty = 0
 #2: tint crosshair
 #3: both
 show owned = 0
+# Show the remaining duration of magic effects and lights
+show effect duration = false
 
 [Saves]
 character =