diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
index 4c8e125..7b01c2e 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
@@ -83,10 +83,12 @@ public class GameActivity extends BaseActivity implements NavigationView.OnNavig
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
         SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+
+        if(sharedPref.getBoolean("pref_keep_screen_on", true)) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        }
+
         GameType gameType = GameType.Unspecified;
         GameDifficulty gameDifficulty = GameDifficulty.Unspecified;
         int loadLevelID = 0;
diff --git a/app/src/main/res/layout/activity_game_view.xml b/app/src/main/res/layout/activity_game_view.xml
index 4278fe9..2e33c3f 100644
--- a/app/src/main/res/layout/activity_game_view.xml
+++ b/app/src/main/res/layout/activity_game_view.xml
@@ -40,10 +40,10 @@
                     android:layout_height="wrap_content"
                     android:text="@string/gametype_unspecified"
                     android:id="@+id/gameModeText"
-                    android:layout_weight="8"/>
+                    android:layout_weight="7"/>
                 <RelativeLayout
                     android:layout_width="0dp"
-                    android:layout_weight="4"
+                    android:layout_weight="5"
                     android:layout_height="wrap_content">
                     <TextView
                         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 35fed86..eb262de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -140,6 +140,8 @@
     <string name="help_permissions_summary">Privacy Friendly Sudoku does not use any permissions.</string>
     <string name="okay">Okay</string>
     <string name="view_help">View Help</string>
-    <string name="difficulty_challenge">Challenge</string>
-    <string name="pref_highlightInputError">Highlight input mistakes</string>
+    <string name="difficulty_challenge" translatable="false">Challenge</string>
+    <string name="pref_highlightInputError" translatable="false">Highlight input mistakes</string>
+    <string name="pref_keep_screen_on">Keep Screen On</string>
+    <string name="pref_keep_screen_on_summary">Don\'t turn the screen off while playing</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_settings_general.xml b/app/src/main/res/xml/pref_settings_general.xml
index 793e450..3102b95 100644
--- a/app/src/main/res/xml/pref_settings_general.xml
+++ b/app/src/main/res/xml/pref_settings_general.xml
@@ -13,7 +13,13 @@
         android:summary="@string/pref_timer_reset_summary"
         android:defaultValue="true" />
 
-    <ListPreference
+    <SwitchPreference android:id="@+id/pref_keep_screen_on"
+        android:key="pref_keep_screen_on"
+        android:title="@string/pref_keep_screen_on"
+        android:summary="@string/pref_keep_screen_on_summary"
+        android:defaultValue="true"/>
+
+        <ListPreference
         android:key="pref_symbols"
         android:title="@string/pref_symbols"
         android:defaultValue="Default"