diff --git a/app/src/main/java/com/osfans/trime/ime/core/BaseInputView.kt b/app/src/main/java/com/osfans/trime/ime/core/BaseInputView.kt
index 2ae070e1b6..fa06ba2fdf 100644
--- a/app/src/main/java/com/osfans/trime/ime/core/BaseInputView.kt
+++ b/app/src/main/java/com/osfans/trime/ime/core/BaseInputView.kt
@@ -27,6 +27,7 @@ import com.osfans.trime.ime.keyboard.InputFeedbackManager
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import splitties.dimensions.dp
+import splitties.views.dsl.core.withTheme
 import kotlin.math.max
 
 abstract class BaseInputView(
@@ -60,6 +61,8 @@ abstract class BaseInputView(
             }
         }
 
+    val themedContext = context.withTheme(android.R.style.Theme_DeviceDefault_Settings)
+
     private var candidateActionMenu: PopupMenu? = null
 
     fun showCandidateActionMenu(idx: Int, text: String, view: View, global: Boolean) {
@@ -74,7 +77,7 @@ abstract class BaseInputView(
         service.lifecycleScope.launch {
             InputFeedbackManager.keyPressVibrate(view, longPress = true)
             candidateActionMenu =
-                PopupMenu(context, view).apply {
+                PopupMenu(themedContext, view).apply {
                     menu.add(title).apply {
                         isEnabled = false
                     }
diff --git a/app/src/main/java/com/osfans/trime/ime/core/InputView.kt b/app/src/main/java/com/osfans/trime/ime/core/InputView.kt
index 1b1271f9ce..3aa0a3fb01 100644
--- a/app/src/main/java/com/osfans/trime/ime/core/InputView.kt
+++ b/app/src/main/java/com/osfans/trime/ime/core/InputView.kt
@@ -54,7 +54,6 @@ import splitties.views.dsl.core.add
 import splitties.views.dsl.core.imageView
 import splitties.views.dsl.core.matchParent
 import splitties.views.dsl.core.view
-import splitties.views.dsl.core.withTheme
 import splitties.views.dsl.core.wrapContent
 import splitties.views.imageDrawable
 
@@ -90,7 +89,6 @@ class InputView(
 
     private val updateWindowViewHeightJob: Job
 
-    private val themedContext = context.withTheme(android.R.style.Theme_DeviceDefault_Settings)
     private val inputDepMgr = InputDependencyManager.initialize(this, themedContext, theme, service, rime)
     private val di = inputDepMgr.di
     private val broadcaster: InputBroadcaster by di.instance()
@@ -102,7 +100,6 @@ class InputView(
     private val keyboardWindow: KeyboardWindow by di.instance()
     private val liquidWindow: LiquidWindow by di.instance()
 
-    private val inlinePreeditMode by AppPrefs.defaultInstance().general.inlinePreeditMode
     private val candidatesMode by AppPrefs.defaultInstance().candidates.mode
 
     private val keyboardSidePadding = theme.generalStyle.keyboardPadding