diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js
index 5b7e09387..de5d3c063 100644
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -276,12 +276,13 @@ var ScreenshotService = class {
                     blue / 255.0,
                 ]),
             }]);
-            this._removeShooterForSender(invocation.get_sender());
             invocation.return_value(retval);
         } catch (e) {
             invocation.return_error_literal(
                 Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
                 'Operation was cancelled');
+        } finally {
+            this._removeShooterForSender(invocation.get_sender());
         }
     }
 };