diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index 33b75b969..3550cb114 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -133,6 +133,8 @@ public final class GalleryListScene extends Scene implements SearchBar.Helper,
 
     private ListUrlBuilder mListUrlBuilder = new ListUrlBuilder();
 
+    private int mDrawerListActivatedPosition;
+
     private SimpleDialog.OnCreateCustomViewListener mGoToCreateCustomViewListener =
             new SimpleDialog.OnCreateCustomViewListener() {
                 @Override
@@ -207,10 +209,12 @@ public final class GalleryListScene extends Scene implements SearchBar.Helper,
         switch (mode) {
             default:
             case MODE_HOMEPAGE:
+                mDrawerListActivatedPosition = ContentActivity.DRAWER_LIST_HOMEPAGE;
                 mActivity.setDrawerListActivatedPosition(ContentActivity.DRAWER_LIST_HOMEPAGE);
                 mListUrlBuilder.reset();
                 break;
             case MODE_POPULAR:
+                mDrawerListActivatedPosition = ContentActivity.DRAWER_LIST_WHATS_HOT;
                 mActivity.setDrawerListActivatedPosition(ContentActivity.DRAWER_LIST_WHATS_HOT);
                 mListUrlBuilder.setMode(ListUrlBuilder.MODE_POPULAR);
                 break;
@@ -323,6 +327,13 @@ public final class GalleryListScene extends Scene implements SearchBar.Helper,
         }
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        ((ContentActivity) getStageActivity()).setDrawerListActivatedPosition(mDrawerListActivatedPosition);
+    }
+
     @Override
     protected void saveInstanceState(Bundle outState) {
         super.saveInstanceState(outState);
@@ -578,6 +589,7 @@ public final class GalleryListScene extends Scene implements SearchBar.Helper,
             return;
         }
 
+        mDrawerListActivatedPosition = ContentActivity.DRAWER_LIST_NONE;
         mActivity.setDrawerListActivatedPosition(ContentActivity.DRAWER_LIST_NONE);
 
         mSearchDatabase.addQuery(query);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java
index 591c9eb42..9502085dc 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java
@@ -20,6 +20,7 @@ import android.content.res.Resources;
 import android.os.Bundle;
 
 import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.ui.ContentActivity;
 import com.hippo.scene.preference.PreferenceHeader;
 import com.hippo.scene.preference.PreferenceHeaderScene;
 
@@ -29,6 +30,8 @@ public final class MainSettingsScene extends PreferenceHeaderScene {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        ((ContentActivity) getStageActivity()).setDrawerListActivatedPosition(ContentActivity.DRAWER_LIST_SETTINGS);
+
         setTitle(R.string.settings);
         setIcon(R.drawable.ic_arrow_left_dark);
 
@@ -51,6 +54,13 @@ public final class MainSettingsScene extends PreferenceHeaderScene {
         setPreferenceHeaders(phs);
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        ((ContentActivity) getStageActivity()).setDrawerListActivatedPosition(ContentActivity.DRAWER_LIST_SETTINGS);
+    }
+
     private PreferenceHeader newPreferenceHeader(int drawableId, int titleId, Class clazz) {
         Resources resources = getStageActivity().getResources();
         return new PreferenceHeader(