diff --git a/app/src/main/res/drawable-v23/m3_popup_background.xml b/app/src/main/res/drawable-v23/m3_popup_background.xml
new file mode 100644
index 000000000..3ede5c457
--- /dev/null
+++ b/app/src/main/res/drawable-v23/m3_popup_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape>
+			<solid android:color="?attr/colorSurface" />
+			<corners android:radius="@dimen/m3_alert_dialog_corner_size" />
+		</shape>
+	</item>
+	<item>
+		<shape>
+			<solid android:color="@color/m3_popupmenu_overlay_color" />
+			<corners android:radius="@dimen/m3_alert_dialog_corner_size" />
+		</shape>
+	</item>
+</layer-list>
diff --git a/app/src/main/res/drawable/m3_popup_background.xml b/app/src/main/res/drawable/m3_popup_background.xml
index 3ede5c457..98f60a8be 100644
--- a/app/src/main/res/drawable/m3_popup_background.xml
+++ b/app/src/main/res/drawable/m3_popup_background.xml
@@ -2,13 +2,13 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 	<item>
 		<shape>
-			<solid android:color="?attr/colorSurface" />
+			<solid android:color="@color/kotatsu_surface" />
 			<corners android:radius="@dimen/m3_alert_dialog_corner_size" />
 		</shape>
 	</item>
 	<item>
 		<shape>
-			<solid android:color="@color/m3_popupmenu_overlay_color" />
+			<solid android:color="@color/kotatsu_surface" />
 			<corners android:radius="@dimen/m3_alert_dialog_corner_size" />
 		</shape>
 	</item>