diff --git a/app/build.gradle b/app/build.gradle
index 5eae826cf..02410a7a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId 'org.pocketworkstation.pckeyboard'
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 1040006
-        versionName "v1.40.6"
+        versionCode 1040007
+        versionName "v1.40.7"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
diff --git a/app/src/main/java/org/pocketworkstation/pckeyboard/CandidateView.java b/app/src/main/java/org/pocketworkstation/pckeyboard/CandidateView.java
index 39e232cd7..32a5c6cc1 100755
--- a/app/src/main/java/org/pocketworkstation/pckeyboard/CandidateView.java
+++ b/app/src/main/java/org/pocketworkstation/pckeyboard/CandidateView.java
@@ -110,7 +110,7 @@ public CandidateView(Context context, AttributeSet attrs) {
         mPreviewPopup.setBackgroundDrawable(null);
         mPreviewPopup.setAnimationStyle(R.style.KeyPreviewAnimation);
         // Enable clipping for Android P, keep disabled for older versions.
-        boolean clippingEnabled = (Build.VERSION.SDK_INT > Build.VERSION_CODES.O);
+        boolean clippingEnabled = (Build.VERSION.SDK_INT >= 28 /* Build.VERSION_CODES.P */);
         mPreviewPopup.setClippingEnabled(clippingEnabled);
         mColorNormal = res.getColor(R.color.candidate_normal);
         mColorRecommended = res.getColor(R.color.candidate_recommended);
diff --git a/app/src/main/java/org/pocketworkstation/pckeyboard/LatinKeyboardView.java b/app/src/main/java/org/pocketworkstation/pckeyboard/LatinKeyboardView.java
index e37168338..352811c38 100644
--- a/app/src/main/java/org/pocketworkstation/pckeyboard/LatinKeyboardView.java
+++ b/app/src/main/java/org/pocketworkstation/pckeyboard/LatinKeyboardView.java
@@ -158,7 +158,7 @@ public LatinKeyboardView(Context context, AttributeSet attrs, int defStyle) {
         // If true, popups are forced to remain inside the keyboard area. If false,
         // they can extend above it. Enable clipping just for Android P since drawing
         // outside the keyboard area doesn't work on that version.
-        boolean clippingEnabled = (Build.VERSION.SDK_INT > Build.VERSION_CODES.O);
+        boolean clippingEnabled = (Build.VERSION.SDK_INT >= 28 /* Build.VERSION_CODES.P */);
 
         if (previewLayout != 0) {
             mPreviewPopup = new PopupWindow(context);