diff --git a/js/main.js b/js/main.js
index 5d8a1e5..36a0c63 100644
--- a/js/main.js
+++ b/js/main.js
@@ -439,6 +439,7 @@ class Player extends PrimaryView {
         key_target.addEventListener('keydown', ev => {
             if (! this.active)
                 return;
+            this.using_touch = false;
 
             if (ev.key === 'p' || ev.key === 'Pause') {
                 this.toggle_pause();
@@ -506,10 +507,12 @@ class Player extends PrimaryView {
         });
         // Similarly, grab touch events and translate them to directions
         this.current_touches = {};  // ident => action
+        this.touch_restart_delay = new util.DelayTimer;
         let touch_target = this.root.querySelector('.-main-area');
         let collect_touches = ev => {
             ev.stopPropagation();
             ev.preventDefault();
+            this.using_touch = true;
 
             // If state is anything other than playing/waiting, probably switch to playing, similar
             // to pressing spacebar
@@ -519,10 +522,13 @@ class Player extends PrimaryView {
                     return;
                 }
                 else if (this.state === 'stopped') {
-                    if (this.level.state === 'success') {
+                    if (this.touch_restart_delay.active) {
+                        // If it's only been a very short time since the level ended, ignore taps
+                        // here, so you don't accidentally mash restart and lose the chance to undo
+                    }
+                    else if (this.level.state === 'success') {
                         // Advance to the next level
                         // TODO game ending?
-                        // TODO this immediately begins it too, not sure why
                         this.conductor.change_level(this.conductor.level_index + 1);
                     }
                     else {
@@ -1249,6 +1255,9 @@ class Player extends PrimaryView {
             }
         }
         else if (this.state === 'stopped') {
+            // Set a timer before tapping the overlay will restart/advance
+            this.touch_restart_delay.set(2000);
+
             if (this.level.state === 'failure') {
                 overlay_reason = 'failure';
                 overlay_top = "whoops";
@@ -1256,7 +1265,7 @@ class Player extends PrimaryView {
                 overlay_bottom = random_choice(obits);
                 if (this.using_touch) {
                     // TODO touch gesture to rewind?
-                    overlay_keyhint = "tap to try again, or tap undo/rewind above";
+                    overlay_keyhint = "tap to try again, or use undo/rewind above";
                 }
                 else {
                     overlay_keyhint = "press space to try again, or Z to rewind";
diff --git a/js/util.js b/js/util.js
index c532d6f..15dc749 100644
--- a/js/util.js
+++ b/js/util.js
@@ -162,6 +162,28 @@ export function bytestring_to_buffer(bytestring) {
     return Uint8Array.from(bytestring, c => c.charCodeAt(0)).buffer;
 }
 
+export class DelayTimer {
+    constructor() {
+        this.active = false;
+        this._handle = null;
+        this._bound_alarm = this._alarm.bind(this);
+    }
+
+    set(duration) {
+        if (this._handle) {
+            window.clearTimeout(this._handle);
+        }
+
+        this.active = true;
+        this._handle = window.setTimeout(this._bound_alarm, duration);
+    }
+
+    _alarm() {
+        this._handle = null;
+        this.active = false;
+    }
+}
+
 // Cast a line through a grid and yield every cell it touches
 export function* walk_grid(x0, y0, x1, y1, min_a, min_b, max_a, max_b) {
     // TODO if the ray starts outside the grid (extremely unlikely), we should