diff --git a/docs/index.html b/docs/index.html
index e9d527f93..223bc60a9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -699,6 +699,18 @@
       <td>F4</td>
     </tr>
 
+    <tr>
+      <td>Toggle Black/White TV</td>
+      <td>-</td>
+      <td>-</td>
+    </tr>
+
+    <tr>
+      <td>Toggle 7800 pause &#185;</td>
+      <td>Alt + F3</td>
+      <td>Cmd + F3</td>
+    </tr>
+
     <tr>
       <td>Left Player Difficulty A</td>
       <td>F5</td>
@@ -729,7 +741,7 @@
       <td>F9</td>
     </tr>
 
-  <tr>
+    <tr>
       <td>Save all Time Machine states</td>
       <td>Alt + F9</td>
       <td>Cmd + F9</td>
@@ -777,6 +789,11 @@
       <td>Shift-Cmd + P</td>
     </tr>
 
+    <tr>
+      <td colspan="3"><center><font size="-1">
+      &#185; only if "Console" is set to "Atari 7800" in <b><a href="#Debugger">Developer Settings</a></b>.
+      </td>
+    </tr>
   </table>
 
   </br>
diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index 7ad4b6813..83468338c 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -1659,12 +1659,10 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
         myOSystem.console().switches().update();
       }
       return;
-
     case Event::Console7800Pause:
       if(pressed && !repeated)
       {
-        myEvent.set(Event::ConsoleBlackWhite, 0);
-        myEvent.set(Event::ConsoleColor, 0);
+        myEvent.set(Event::Console7800Pause, myOSystem.console().switches().tvColor() ? 1 : 0);
         if (myIs7800)
           myOSystem.frameBuffer().showTextMessage("Pause pressed");
         myOSystem.console().switches().update();