diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index 77107dea9..56b7ec904 100644
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -1218,6 +1218,8 @@ public boolean navigateToHistory(History history) {
                         (NavigationViewInfoParcelable)realHistory.getItem();
                 int viewId = info.getId();
                 NavigationView view = getNavigationView(viewId);
+                // Selected items must not be restored from on history navigation
+                info.setSelectedFiles(view.getSelectedFiles());
                 view.onRestoreState(info);
 
             } else if (realHistory.getItem() instanceof SearchInfoParcelable) {
diff --git a/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java b/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java
index bc25c5ccf..c0f5facba 100644
--- a/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java
@@ -457,6 +457,7 @@ private void doSelectDeselectAllVisibleItems(boolean select) {
                             theme.getDrawable(
                                     getContext(), "checkbox_deselected_drawable"); //$NON-NLS-1$
                 }
+                notifyDataSetChanged();
 
                 //Add or remove from the global selected items
                 FileSystemObject fso = getItem(i);