diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
index 1035722b1a..d72d6c6041 100644
--- a/src/org/thoughtcrime/securesms/ShareActivity.java
+++ b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -36,6 +36,7 @@ import android.support.v7.widget.Toolbar;
 import org.thoughtcrime.securesms.conversation.ConversationActivity;
 import org.thoughtcrime.securesms.logging.Log;
 
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 
@@ -140,6 +141,16 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case android.R.id.home:
+        onBackPressed();
+        return true;
+    }
+    return super.onOptionsItemSelected(item);
+  }
+
   @Override
   public void onBackPressed() {
     if (searchToolbar.isVisible()) searchToolbar.collapse();