diff --git a/app/src/main/java/com/zulip/android/activities/ZulipActivity.java b/app/src/main/java/com/zulip/android/activities/ZulipActivity.java
index d9725e1ee..a55069083 100644
--- a/app/src/main/java/com/zulip/android/activities/ZulipActivity.java
+++ b/app/src/main/java/com/zulip/android/activities/ZulipActivity.java
@@ -1204,6 +1204,8 @@ public boolean onChildClick(ExpandableListView parent, View v, int groupPosition
                         String subjectName = ((Cursor) streamsDrawer.getExpandableListAdapter().getChild(groupPosition, childPosition)).getString(0);
                         onNarrow(new NarrowFilterStream(streamName, subjectName));
                         onNarrowFillSendBoxStream(streamName, subjectName, false);
+                        hideView(chatBox);
+                        displayFAB(true);
                         break;
                     default:
                         return false;
@@ -1220,6 +1222,8 @@ public boolean onGroupClick(ExpandableListView expandableListView, View view, in
                 String streamName = ((TextView) view.findViewById(R.id.name)).getText().toString();
                 doNarrowToLastRead(streamName);
                 drawerLayout.openDrawer(GravityCompat.START);
+                hideView(chatBox);
+                displayFAB(true);
                 if (previousClick != -1 && expandableListView.getCount() > previousClick) {
                     expandableListView.collapseGroup(previousClick);
                 }
@@ -1237,6 +1241,8 @@ public boolean setViewValue(View view, Cursor cursor, int columnIndex) {
                         TextView name = (TextView) view;
                         final String streamName = cursor.getString(columnIndex);
                         name.setText(streamName);
+                        hideView(chatBox);
+                        displayFAB(true);
                         //Change color in the drawer if this stream is inHomeView only.
                         if (!Stream.getByName(app, streamName).getInHomeView()) {
                             name.setTextColor(ContextCompat.getColor(ZulipActivity.this, R.color.colorTextTertiary));