diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 5be873d58..6e5d8b9e3 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -239,7 +239,7 @@
                                 <Property key="Caption" value="VSync"/>
                             </Widget>
                         </Widget>
-                        <Widget type="HBox" skin="" position="182 34 300 24">
+                        <Widget type="HBox" skin="" position="182 64 300 24">
                             <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="BorderlessButton">
                                 <UserString key="SettingCategory" value="Video"/>
                                 <UserString key="SettingName" value="borderless"/>
@@ -249,13 +249,13 @@
                                 <Property key="Caption" value="Borderless"/>
                             </Widget>
                         </Widget>
-                        <Widget type="HBox" skin="" position="182 64 300 24">
+                        <Widget type="HBox" skin="" position="182 94 300 24">
                             <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="FPSButton"/>
                             <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 32 16" align="Left Top">
                                 <Property key="Caption" value="FPS"/>
                             </Widget>
                         </Widget>
-                        <Widget type="HBox" skin="" position="182 94 300 24">
+                        <Widget type="HBox" skin="" position="182 124 300 24">
                             <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="ShadersButton">
                                 <UserString key="SettingCategory" value="Objects"/>
                                 <UserString key="SettingName" value="shaders"/>
@@ -265,7 +265,7 @@
                                 <Property key="Caption" value="Object shaders"/>
                             </Widget>
                         </Widget>
-                        <Widget type="HBox" skin="" position="182 124 300 24">
+                        <Widget type="HBox" skin="" position="182 154 300 24">
                             <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="ShaderModeButton"/>
                             <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 93 16" align="Left Top">
                                 <Property key="Caption" value="Shader mode"/>
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 25959546e..69a9b2db5 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -6,7 +6,7 @@ resolution x = 800
 resolution y = 600
 
 fullscreen = false
-borderless = true
+borderless = false
 screen = 0
 
 # Minimize the window if it loses key focus?