diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
index 1c5f1731084d..608c627922ba 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -725,7 +725,16 @@ private void handleBottomNavigationViewClicks() {
             } else if (menuItemId == R.id.nav_gallery) {
                 openMediaTab(menuItem.getItemId());
             } else if (menuItemId == R.id.nav_album) {
-                replaceAlbumFragment();
+                if (this instanceof FileDisplayActivity) {
+                    replaceAlbumFragment();
+                } else {
+                    // when user is not on FileDisplayActivity
+                    // if user is on TrashbinActivity then we have to start activity again
+                    Intent intent = new Intent(getApplicationContext(), FileDisplayActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                    intent.setAction(FileDisplayActivity.ALBUMS);
+                    startActivity(intent);
+                }
             }
 
             // Remove extra icon from the action bar