diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 599783e42..3c8e06dc0 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -419,11 +419,14 @@ namespace MWGui
         else
         {
             // re-enable
-            mWaterShaderButton->setEnabled(true);
-            mReflectObjectsButton->setEnabled(true);
-            mReflectActorsButton->setEnabled(true);
-            mReflectTerrainButton->setEnabled(true);
-            mShadowsEnabledButton->setEnabled(true);
+            if (MWRender::RenderingManager::waterShaderSupported())
+            {
+                mWaterShaderButton->setEnabled(true);
+                mReflectObjectsButton->setEnabled(true);
+                mReflectActorsButton->setEnabled(true);
+                mReflectTerrainButton->setEnabled(true);
+                mShadowsEnabledButton->setEnabled(true);
+            }
 
             Settings::Manager::setBool("shaders", "Objects", true);
             Settings::Manager::setString("shader mode", "General", val);
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 07c307324..a14606ade 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -189,10 +189,10 @@
 
                         </Widget>
 
-                        <Widget type="TextBox" skin="SandText" position="42 200 120 24" align="Left Top">
+                        <Widget type="TextBox" skin="SandText" position="42 135 300 24" align="Left Top">
                             <Property key="Caption" value="Underwater effects (caustics, fog)"/>
                         </Widget>
-                        <Widget type="Button" skin="MW_Button" position="4 200 34 24" align="Left Top" name="UnderwaterButton"/>
+                        <Widget type="Button" skin="MW_Button" position="4 135 34 24" align="Left Top" name="UnderwaterButton"/>
                     </Widget>
 
                     <Widget type="TabItem" skin="" position="4 28 344 272">