diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30f02bed33..9aff710043 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -107,6 +107,7 @@
     Bug #6606: Quests with multiple IDs cannot always be restarted
     Bug #6653: With default settings the in-game console doesn't fit into screen
     Bug #6655: Constant effect absorb attribute causes the game to break
+    Bug #6667: Pressing the Esc key while resting or waiting causes black screen.
     Bug #6670: Dialogue order is incorrect
     Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
     Bug #6682: HitOnMe doesn't fire as intended
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index 754777c507..9cda792a86 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -98,12 +98,22 @@ namespace MWGui
 
     bool WaitDialog::exit()
     {
-        return (!mTimeAdvancer.isRunning()); //Only exit if not currently waiting
+        bool canExit = !mTimeAdvancer.isRunning(); // Only exit if not currently waiting
+        if (canExit)
+        {
+            clear();
+            stopWaiting();
+        }
+        return canExit;
     }
 
     void WaitDialog::clear()
     {
         mSleeping = false;
+        mHours = 1;
+        mManualHours = 1;
+        mFadeTimeRemaining = 0;
+        mInterruptAt = -1;
         mTimeAdvancer.stop();
     }