diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
index 0ba06ed2a..9f7e27bc9 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
@@ -9,6 +9,7 @@ import android.graphics.Color;
 import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.provider.MediaStore;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.Snackbar;
@@ -55,6 +56,7 @@ public class MainActivity extends AppCompatActivity
     private boolean isSnackbarShown;
     private List<String> toBeDeleted;
     private ActionMode actionMode;
+    private Parcelable state;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -86,12 +88,16 @@ public class MainActivity extends AppCompatActivity
     protected void onResume() {
         super.onResume();
         tryloadGallery();
+        if (state != null && gridView != null)
+            gridView.onRestoreInstanceState(state);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
         deleteDirs();
+        if (gridView != null)
+            state = gridView.onSaveInstanceState();
     }
 
     private void tryloadGallery() {