diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameController.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameController.java
index ef1d1b1..024ae02 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameController.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameController.java
@@ -317,8 +317,14 @@ public class GameController implements IModelChangedListener, Parcelable {
 
     public void resetLevel() {
         gameBoard.reset();
-        undoRedoManager.addState(gameBoard);
-        //notifyListeners();
+
+        if(settings.getBoolean("pref_timer_reset", true)) {
+            time = 0;
+            undoRedoManager = new UndoRedoManager(gameBoard);
+        } else {
+            undoRedoManager.addState(gameBoard);
+        }
+
         notifyHighlightChangedListeners();
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d6eeace..d54a269 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,6 +52,8 @@
     </array>
     <string name="pref_automatic_note_deletion">Note deletion</string>
     <string name="pref_automatic_note_deletion_summary">Automatically remove notes when setting values on connected cells</string>
+    <string name="pref_timer_reset">Timer Reset</string>
+    <string name="pref_timer_reset_summary">Also reset the timer, when resetting the game board.</string>
 
     <!-- ###ABOUT### -->
     <string name="app_name_long" translatable="false">Privacy friendly Sudoku</string>
diff --git a/app/src/main/res/xml/pref_settings_general.xml b/app/src/main/res/xml/pref_settings_general.xml
index 250edf4..173e752 100644
--- a/app/src/main/res/xml/pref_settings_general.xml
+++ b/app/src/main/res/xml/pref_settings_general.xml
@@ -7,6 +7,12 @@
         android:summary="@string/pref_automatic_note_deletion_summary"
         android:defaultValue="true"/>
 
+    <SwitchPreference android:id="@+id/pref_timer_reset"
+        android:key="pref_timer_reset"
+        android:title="@string/pref_timer_reset"
+        android:summary="@string/pref_timer_reset_summary"
+        android:defaultValue="true" />
+
     <ListPreference
         android:key="pref_symbols"
         android:title="@string/pref_symbols"