diff --git a/app/src/main/java/com/simplemobiletools/gallery/Config.java b/app/src/main/java/com/simplemobiletools/gallery/Config.java
index cebe037bb..da9c2e794 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/Config.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/Config.java
@@ -39,11 +39,17 @@ public class Config {
     }
 
     public int getSorting() {
+        if (getIsSameSorting())
+            return getDirectorySorting();
+
         return mPrefs.getInt(Constants.SORT_ORDER, Constants.SORT_BY_DATE | Constants.SORT_DESCENDING);
     }
 
     public void setSorting(int order) {
-        mPrefs.edit().putInt(Constants.SORT_ORDER, order).apply();
+        if (getIsSameSorting())
+            setDirectorySorting(order);
+        else
+            mPrefs.edit().putInt(Constants.SORT_ORDER, order).apply();
     }
 
     public int getDirectorySorting() {