diff --git a/Changelog.md b/Changelog.md
index 727e72c6d..5866a4f7e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,9 +2,10 @@
 
 ## Bug fixes
 
-* reset comment box height after posting a comment. [#4030](https://github.com/diaspora/diaspora/issues/4030)
-* fade long tag names. [#3899](https://github.com/diaspora/diaspora/issues/3899)
-* avoid posting empty comments. [#3836](https://github.com/diaspora/diaspora/issues/3836)
+* Fix cancel button on getting_started confirmation box [#4073](https://github.com/diaspora/diaspora/issues/4073)
+* Reset comment box height after posting a comment. [#4030](https://github.com/diaspora/diaspora/issues/4030)
+* Fade long tag names. [#3899](https://github.com/diaspora/diaspora/issues/3899)
+* Avoid posting empty comments. [#3836](https://github.com/diaspora/diaspora/issues/3836)
 * Delegate parent_author to the target of a RelayableRetraction
 * Do not fail on receiving a SignedRetraction via the public route
 * Pass the real values to stderr_path and stdout_path in unicorn.rb since it runs a case statement on them.
diff --git a/app/assets/javascripts/pages/users-getting-started.js b/app/assets/javascripts/pages/users-getting-started.js
index 7044f921d..58182923e 100644
--- a/app/assets/javascripts/pages/users-getting-started.js
+++ b/app/assets/javascripts/pages/users-getting-started.js
@@ -34,19 +34,17 @@ Diaspora.Pages.UsersGettingStarted = function() {
     });
 
     $("#awesome_button").bind("click", function(evt){
-
       var confirmMessage = Diaspora.I18n.t("getting_started.no_tags");
+      var message = Diaspora.I18n.t("getting_started.preparing_your_stream");
+      var confirmation = true;
 
-      if(($("#as-selections-tags").find(".as-selection-item").length > 0) || confirm(confirmMessage)) {
-
-        /* flash message prompt */
-        var message = Diaspora.I18n.t("getting_started.preparing_your_stream");
-        Diaspora.page.flashMessages.render({success: true, notice: message});
-      } else {
-        /* flash message prompt */
-        var message = Diaspora.I18n.t("getting_started.alright_ill_wait");
-        Diaspora.page.flashMessages.render({success: true, notice: message});
+      if ($("#as-selections-tags").find(".as-selection-item").length <= 0) {
+        message = Diaspora.I18n.t("getting_started.alright_ill_wait");
+        confirmation = confirm(confirmMessage);
       }
+
+      Diaspora.page.flashMessages.render({success: true, notice: message});
+      return confirmation;
     });
 
     /* ------ */
diff --git a/features/signs_up.feature b/features/signs_up.feature
index 5c7fb808b..186c48cb8 100644
--- a/features/signs_up.feature
+++ b/features/signs_up.feature
@@ -17,10 +17,17 @@ Feature: new user registration
       | profile_first_name | O             |
     And I preemptively confirm the alert
     And I follow "awesome_button"
-
     Then I should be on the stream page
     And I should not see "awesome_button"
 
+  Scenario: new user does not add any tags in setup wizard and cancel the alert
+    When I fill in the following:
+      | profile_first_name | some name     |
+    And I preemptively reject the alert
+    And I follow "awesome_button"
+    Then I should be on the getting started page
+    And I should see a flash message containing "Alright, I'll wait."
+
   Scenario: new user skips the setup wizard
     When I preemptively confirm the alert
     And I follow "awesome_button"