diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index c8fce33d5a4..59b42d13f43 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -91,8 +91,8 @@ export default Ember.Controller.extend(CanCheckEmails, {
   },
 
   actions: {
-    expandProfile() {
-      this.set('forceExpand', true);
+    toggleExtendedProfile() {
+      this.toggleProperty('forceExpand');
     },
 
     showSuspensions() {
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 469dc539539..9360db65367 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -67,12 +67,17 @@
                               connectorTagName="li"
                               args=(hash model=model)}}
 
-              {{#if collapsedInfo}}
               {{#if viewingSelf}}
-              <li><a {{action "expandProfile"}} href class="btn">{{d-icon "angle-double-down"}}{{i18n 'user.expand_profile'}}</a></li>
+                <li>
+                  <a {{action "toggleExtendedProfile"}} href class="btn">
+                    {{#if collapsedInfo}}
+                      {{d-icon "angle-double-down"}} {{i18n 'user.expand_profile'}}
+                    {{else}}
+                      {{d-icon "angle-double-up"}} {{i18n 'user.collapse_profile'}}
+                    {{/if}}
+                  </a>
+                </li>
               {{/if}}
-              {{/if}}
-
             </ul>
           </section>
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 52bf9d24691..ebd4ee53465 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -617,6 +617,7 @@ en:
       activity_stream: "Activity"
       preferences: "Preferences"
       expand_profile: "Expand"
+      collapse_profile: "Collapse"
       bookmarks: "Bookmarks"
       bio: "About me"
       invited_by: "Invited By"