diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java
index 6894da0..e3e1dcc 100644
--- a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java
+++ b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java
@@ -60,18 +60,20 @@ public class ChatActivity extends AppCompatActivity
         setContentView(R.layout.activity_chat);
         ButterKnife.bind(this);
 
-        setSupportActionBar(toolbar);
-
         MercuryImApplication.getApplication().getAppComponent().inject(this);
 
-        recyclerView.setAdapter(recyclerViewAdapter);
-        recyclerView.setLayoutManager(new LinearLayoutManager(this));
-
         if (savedInstanceState == null) {
             savedInstanceState = getIntent().getExtras();
             if (savedInstanceState == null) return;
         }
 
+        setSupportActionBar(toolbar);
+        // Show back arrow
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        recyclerView.setAdapter(recyclerViewAdapter);
+        recyclerView.setLayoutManager(new LinearLayoutManager(this));
+
         String jidString = savedInstanceState.getString(EXTRA_JID);
         if (jidString != null) {
             jid = JidCreate.entityBareFromOrThrowUnchecked(jidString);
@@ -179,4 +181,11 @@ public class ChatActivity extends AppCompatActivity
         chatViewModel.queryTextChanged(query);
         return false;
     }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        // Go back when left arrow is pressed in toolbar
+        onBackPressed();
+        return true;
+    }
 }