diff --git a/docs/index.html b/docs/index.html
index 789ea63c2..169bc0bc6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1806,13 +1806,13 @@
     </tr>
     <tr>
       <td>Save continuous PNG snapshots</br>(per interval defined in <a href="#Snapshots"><b>Snapshot Settings</b></a>)</td>
-      <td>Alt + s</td>
-      <td>Cmd + s</td>
+      <td>Control-Alt + s</td>
+      <td>Control-Cmd + s</td>
     </tr>
     <tr>
       <td>Save continuous PNG snapshots (every frame)</td>
-      <td>Shift-Alt + s</td>
-      <td>Shift-Cmd + s</td>
+      <td>Shift-Control-Alt + s</td>
+      <td>Shift-Control-Cmd + s</td>
     </tr>
 
     <tr>
diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index 5a1be8804..a1ee45b0e 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -534,8 +534,8 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultCommo
   {Event::ToggleTimeMachine,        KBDK_T, MOD3},
 
 #ifdef PNG_SUPPORT
-  {Event::ToggleContSnapshots,      KBDK_S, MOD3},
-  {Event::ToggleContSnapshotsFrame, KBDK_S, KBDM_SHIFT | MOD3},
+  {Event::ToggleContSnapshots,      KBDK_S, MOD3 | KBDM_CTRL},
+  {Event::ToggleContSnapshotsFrame, KBDK_S, KBDM_SHIFT | MOD3 | KBDM_CTRL},
 #endif
 
   {Event::DecreaseAutoFire,         KBDK_A, KBDM_SHIFT | KBDM_CTRL},
diff --git a/src/common/PNGLibrary.cxx b/src/common/PNGLibrary.cxx
index ae7d3390f..901d42478 100644
--- a/src/common/PNGLibrary.cxx
+++ b/src/common/PNGLibrary.cxx
@@ -296,7 +296,6 @@ void PNGLibrary::takeSnapshot(uInt32 number)
 
   // Figure out the correct snapshot name
   string filename;
-  bool showmessage = number == 0;
   string sspath = myOSystem.snapshotSaveDir().getPath() +
       (myOSystem.settings().getString("snapname") != "int" ?
           myOSystem.romFile().getNameWithExt("")
@@ -347,9 +346,9 @@ void PNGLibrary::takeSnapshot(uInt32 number)
   VarList::push_back(comments, "TV Effects", myOSystem.frameBuffer().tiaSurface().effectsInfo());
 
   // Now create a PNG snapshot
+  string message = "Snapshot saved";
   if(myOSystem.settings().getBool("ss1x"))
   {
-    string message = "Snapshot saved";
     try
     {
       Common::Rect rect;
@@ -360,8 +359,6 @@ void PNGLibrary::takeSnapshot(uInt32 number)
     {
       message = e.what();
     }
-    if(showmessage)
-      myOSystem.frameBuffer().showMessage(message);
   }
   else
   {
@@ -369,7 +366,6 @@ void PNGLibrary::takeSnapshot(uInt32 number)
     myOSystem.frameBuffer().enableMessages(false);
     myOSystem.frameBuffer().tiaSurface().renderForSnapshot();
 
-    string message = "Snapshot saved";
     try
     {
       myOSystem.png().saveImage(filename, comments);
@@ -381,9 +377,8 @@ void PNGLibrary::takeSnapshot(uInt32 number)
 
     // Re-enable old messages
     myOSystem.frameBuffer().enableMessages(true);
-    if(showmessage)
-      myOSystem.frameBuffer().showMessage(message);
   }
+  myOSystem.frameBuffer().showMessage(message);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -