diff --git a/app/src/main/kotlin/org/fossify/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/org/fossify/keyboard/views/MyKeyboardView.kt
index ddfd3e43..9b1bdc4e 100644
--- a/app/src/main/kotlin/org/fossify/keyboard/views/MyKeyboardView.kt
+++ b/app/src/main/kotlin/org/fossify/keyboard/views/MyKeyboardView.kt
@@ -395,7 +395,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
             mVoiceInputMethod = config.voiceInputMethod
         }
 
-        val isMainKeyboard = changedView == null || changedView != keyboardPopupBinding?.miniKeyboardView
+        val isMainKeyboard = changedView == null || changedView.id != R.id.mini_keyboard_view
         mKeyColor = getKeyColor()
         mKeyColorPressed = mKeyColor.adjustAlpha(0.2f)
         mKeyBackground = if (mShowKeyBorders && isMainKeyboard) {
diff --git a/app/src/main/res/drawable/minikeyboard_background.xml b/app/src/main/res/drawable/minikeyboard_background.xml
index 1b7bc32f..a7b8b54c 100644
--- a/app/src/main/res/drawable/minikeyboard_background.xml
+++ b/app/src/main/res/drawable/minikeyboard_background.xml
@@ -3,7 +3,7 @@
     <item android:id="@+id/button_background_shape">
         <shape android:shape="rectangle">
             <solid android:color="@color/theme_dark_background_color" />
-            <corners android:radius="@dimen/small_margin" />
+            <corners android:radius="@dimen/medium_margin" />
         </shape>
     </item>
 
@@ -13,7 +13,7 @@
                 android:width="1dp"
                 android:color="@color/divider_grey" />
             <solid android:color="@android:color/transparent" />
-            <corners android:radius="@dimen/small_margin" />
+            <corners android:radius="@dimen/medium_margin" />
         </shape>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/minikeyboard_selected_background.xml b/app/src/main/res/drawable/minikeyboard_selected_background.xml
index 13def77b..bfffd789 100644
--- a/app/src/main/res/drawable/minikeyboard_selected_background.xml
+++ b/app/src/main/res/drawable/minikeyboard_selected_background.xml
@@ -3,7 +3,7 @@
     <item android:id="@+id/button_background_shape">
         <shape android:shape="rectangle">
             <solid android:color="@color/color_primary" />
-            <corners android:radius="@dimen/small_margin" />
+            <corners android:radius="@dimen/medium_margin" />
         </shape>
     </item>
 </layer-list>