diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
index 3c943bbbb4..9e06d438f7 100644
--- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -329,6 +329,8 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(MenuItemClickEvent event) {
+        unsetAllDrawerMenuItems();
+
         switch (event.menuItem.getItemId()) {
             case R.id.nav_bar_files:
                 showFiles(false);