diff --git a/Nasal/gui.nas b/Nasal/gui.nas
index 200a2a052..3016ff5b8 100644
--- a/Nasal/gui.nas
+++ b/Nasal/gui.nas
@@ -1254,6 +1254,17 @@ var common_aircraft_keys = {
     ],
 };
 
+_setlistener("/sim/signals/screenshot", func {
+     var path = getprop("/sim/paths/screenshot-last");
+     var button = { button: { legend: "Ok", default: 1, binding: { command: "dialog-close" }}};
+     var success= getprop("/sim/signals/screenshot");
+     if (success) {
+         popupTip("Screenshot written to '" ~ path ~ "'", 3);
+     } else {
+         popupTip("Error writing screenshot '" ~ path ~ "'", 600, button);
+     }
+});
+
 var do_welcome = 1;
 _setlistener("/sim/signals/fdm-initialized", func {
     var haveTutorials = size(props.globals.getNode("/sim/tutorials", 1).getChildren("tutorial"));
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 424b4c6de..b4e84ddbb 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -58,12 +58,7 @@
 				<command>nasal</command>
 				<script>
 					gui.popdown();
-					var success = fgcommand("screen-capture");
-					var path = getprop("/sim/paths/screenshot-last");
-					if (success)
-					gui.popupTip("Screenshot written to '" ~ path ~ "'");
-					else
-					gui.popupTip("Error writing screenshot '" ~ path ~ "'");
+					fgcommand("screen-capture");
 				</script>
 			</binding>
 		</item>
@@ -568,7 +563,7 @@
 			</binding>
 		</item>
 
-        <item>
+		<item>
 			<label>Reload HUD</label>
 			<binding>
 				<command>reinit</command>
diff --git a/keyboard.xml b/keyboard.xml
index cc39cc473..06f7f9423 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -1106,20 +1106,7 @@ top down before the key bindings are parsed.
   <name>F3</name>
   <desc>Capture screen</desc>
   <binding>
-   <command>nasal</command>
-   <script>
-     var success = fgcommand("screen-capture");
-     var path = getprop("/sim/paths/screenshot-last");
-     var threading = getprop("/sim/rendering/multithreading-mode");
-     var button = { button: { legend: "Ok", default: 1, binding: { command: "dialog-close" }}};
-     if (threading and threading != "SingleThreaded") {
-         gui.popupTip("Threading model must be SingleThreaded (or not defined) for snapshots to work.", 600, button);
-     } elsif (success) {
-         gui.popupTip("Screenshot written to '" ~ path ~ "'", 2);
-     } else {
-         gui.popupTip("Error writing screenshot '" ~ path ~ "'", 600, button);
-     }
-   </script>
+   <command>screen-capture</command>
   </binding>
   <mod-shift>
    <desc>Load panel</desc>