diff --git a/src/org/openstreetmap/josm/actions/UploadAction.java b/src/org/openstreetmap/josm/actions/UploadAction.java
index 222e769..edfa143 100644
--- a/src/org/openstreetmap/josm/actions/UploadAction.java
+++ b/src/org/openstreetmap/josm/actions/UploadAction.java
@@ -253,9 +253,9 @@ public class UploadAction extends JosmAction {
         });
         dialog.setUploadedPrimitives(apiData);
         dialog.setVisible(true);
+        dialog.rememberUserInput();
         if (dialog.isCanceled())
             return;
-        dialog.rememberUserInput();
 
         for (UploadHook hook : lateUploadHooks) {
             if (!hook.checkUpload(apiData))