diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 469536c33..c2588b34b 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -718,7 +718,7 @@ en:
     aspect_dropdown:
       add_to_aspect: "Add contact"
       toggle:
-        zero: "Select aspects"
+        zero: "Add contact"
         one: "In %{count} aspect"
         two: "In %{count} aspects"
         few: "In %{count} aspects"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index cb05d5d85..26f1dd42b 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -37,6 +37,7 @@ en:
         disconnected: "The websocket is closed; posts will no longer be streamed live."
       aspect_dropdown:
         add_to_aspect: "Add contact"
+        select_aspects: "Select aspects"
         all_aspects: "All aspects"
         toggle:
           zero: "Select aspects"
diff --git a/public/javascripts/aspects-dropdown.js b/public/javascripts/aspects-dropdown.js
index fc8d557d9..8ae0c13bc 100644
--- a/public/javascripts/aspects-dropdown.js
+++ b/public/javascripts/aspects-dropdown.js
@@ -11,10 +11,14 @@ var AspectsDropdown = {
 
     if (number == 0) {
       button.removeClass(inAspectClass);
-      replacement = Diaspora.I18n.t("aspect_dropdown.toggle.zero");
+      if( dropdown.closest('#publisher').length ) {
+        replacement = Diaspora.I18n.t("aspect_dropdown.select_aspects");
+      } else {
+        replacement = Diaspora.I18n.t("aspect_dropdown.add_to_aspect");
+      }
     }else if (selectedAspects == allAspects) {
       replacement = Diaspora.I18n.t('aspect_dropdown.all_aspects');
-    }else if (number == 1) { 
+    }else if (number == 1) {
       button.addClass(inAspectClass);
       replacement = dropdown.find(".selected").first().text();
     }else if (number < 3) {
@@ -28,7 +32,7 @@ var AspectsDropdown = {
 
     button.text(replacement + ' ▼');
   },
-  
+
   toggleCheckbox: function(check) {
     check.toggleClass('selected');
   }
diff --git a/public/javascripts/contact-edit.js b/public/javascripts/contact-edit.js
index 2a6c9b985..4e55200df 100644
--- a/public/javascripts/contact-edit.js
+++ b/public/javascripts/contact-edit.js
@@ -18,7 +18,7 @@ var ContactEdit = {
     if (number == 0) {
       button.removeClass("in_aspects");
       replacement = Diaspora.I18n.t("aspect_dropdown.toggle.zero");
-    }else if (number == 1) { 
+    }else if (number == 1) {
       button.addClass("in_aspects");
       replacement = dropdown.find(".selected").first().text();
     }else if (number < 3) {