diff --git a/app/build.gradle b/app/build.gradle
index 4cf87473b..ca7d8a046 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "rkr.simplekeyboard.inputmethod"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 59
-        versionName "3.9"
+        versionCode 60
+        versionName "3.10"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/MainKeyboardView.java b/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/MainKeyboardView.java
index a6fbfc16c..a96f81e1f 100644
--- a/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/MainKeyboardView.java
+++ b/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/MainKeyboardView.java
@@ -45,6 +45,7 @@
 import rkr.simplekeyboard.inputmethod.keyboard.internal.MoreKeySpec;
 import rkr.simplekeyboard.inputmethod.keyboard.internal.NonDistinctMultitouchHelper;
 import rkr.simplekeyboard.inputmethod.keyboard.internal.TimerHandler;
+import rkr.simplekeyboard.inputmethod.latin.RichInputMethodManager;
 import rkr.simplekeyboard.inputmethod.latin.RichInputMethodSubtype;
 import rkr.simplekeyboard.inputmethod.latin.common.Constants;
 import rkr.simplekeyboard.inputmethod.latin.common.CoordinateUtils;
@@ -605,8 +606,9 @@ protected void onDrawKeyTopVisuals(final Key key, final Canvas canvas, final Pai
         super.onDrawKeyTopVisuals(key, canvas, paint, params);
         final int code = key.getCode();
         if (code == Constants.CODE_SPACE) {
-            // If input language are explicitly selected.
-            if (mLanguageOnSpacebarFormatType != LanguageOnSpacebarUtils.FORMAT_TYPE_NONE) {
+            // If more than one language is enabled in current input method
+            final RichInputMethodManager imm = RichInputMethodManager.getInstance();
+            if (imm.getMyEnabledInputMethodSubtypeList(false).size() > 1) {
                 drawLanguageOnSpacebar(key, canvas, paint);
             }
         }