diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js
index 59a6c46af..583f8b7c5 100644
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -200,10 +200,10 @@ var ScreenshotService = class {
                 screenshot.screenshot_area(x, y, width, height, stream),
             ]);
             this._onScreenshotComplete(stream, file, invocation);
-            this._removeShooterForSender(invocation.get_sender());
         } catch (e) {
-            this._removeShooterForSender(invocation.get_sender());
             invocation.return_value(new GLib.Variant('(bs)', [false, '']));
+        } finally {
+            this._removeShooterForSender(invocation.get_sender());
         }
     }
 
@@ -223,10 +223,10 @@ var ScreenshotService = class {
                 screenshot.screenshot_window(includeFrame, includeCursor, stream),
             ]);
             this._onScreenshotComplete(stream, file, invocation);
-            this._removeShooterForSender(invocation.get_sender());
         } catch (e) {
-            this._removeShooterForSender(invocation.get_sender());
             invocation.return_value(new GLib.Variant('(bs)', [false, '']));
+        } finally {
+            this._removeShooterForSender(invocation.get_sender());
         }
     }
 
@@ -246,10 +246,10 @@ var ScreenshotService = class {
                 screenshot.screenshot(includeCursor, stream),
             ]);
             this._onScreenshotComplete(stream, file, invocation);
-            this._removeShooterForSender(invocation.get_sender());
         } catch (e) {
-            this._removeShooterForSender(invocation.get_sender());
             invocation.return_value(new GLib.Variant('(bs)', [false, '']));
+        } finally {
+            this._removeShooterForSender(invocation.get_sender());
         }
     }