diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b9b33546e..2577ac51d 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -129,13 +129,15 @@
         <activity
             android:name=".ui.SettingsActivity"
             android:configChanges="screenSize"
-            android:label="@string/settings"
-            android:theme="@style/AppTheme" />
+            android:label="@string/settings" />
+        <activity
+            android:name=".ui.settings.SettingsActivity"
+            android:configChanges="screenSize"
+            android:label="@string/settings" />
         <activity
             android:name=".ui.SecurityActivity"
             android:configChanges="screenSize"
-            android:label="@string/settings"
-            android:theme="@style/AppTheme" />
+            android:label="@string/settings" />
         <activity
             android:name=".shortcuts.ShortcutsActivity"
             android:excludeFromRecents="true"
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt
new file mode 100644
index 000000000..a0f25c808
--- /dev/null
+++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt
@@ -0,0 +1,34 @@
+package com.hippo.ehviewer.ui.settings
+
+import android.os.Bundle
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.navigation.ActivityNavigator
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import com.hippo.ehviewer.ui.EhActivity
+import com.hippo.ehviewer.ui.compose.setMD3Content
+import com.hippo.ehviewer.ui.login.LocalNavController
+
+class SettingsActivity : EhActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setMD3Content {
+            val navController = rememberNavController()
+
+            CompositionLocalProvider(LocalNavController provides navController) {
+                NavHost(navController = navController, startDestination = BASE_SETTINGS_SCREEN) {
+                    composable(BASE_SETTINGS_SCREEN) {
+                    }
+                }
+            }
+        }
+    }
+
+    override fun finish() {
+        super.finish()
+        ActivityNavigator.applyPopAnimationsToPendingTransition(this)
+    }
+}
+
+const val BASE_SETTINGS_SCREEN = "Base"