diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
index e1212e9..7f3d81f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
@@ -260,14 +260,13 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared
                                     }
                                 }
                                 inputConnection.commitText(codeChar.toString(), 1)
+                                updateShiftKeyState()
                             }
                         }
 
                         else -> {
                             inputConnection.commitText(codeChar.toString(), 1)
-                            if (originalText == null) {
-                                updateShiftKeyState()
-                            }
+                            updateShiftKeyState()
                         }
                     }
                 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
index d164f89..d37e517 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
@@ -1218,14 +1218,12 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
                 val secondKeyIndex = getPressedKeyIndex(newPointerX, newPointerY)
                 showPreview(secondKeyIndex)
 
-                mHandler!!.postDelayed({
-                    detectAndSendKey(secondKeyIndex, newPointerX, newPointerY, eventTime)
+                detectAndSendKey(secondKeyIndex, newPointerX, newPointerY, eventTime)
 
-                    val secondKeyCode = mKeys.getOrNull(secondKeyIndex)?.code
-                    if (secondKeyCode != null) {
-                        mOnKeyboardActionListener!!.onPress(secondKeyCode)
-                    }
-                }, REPEAT_INTERVAL.toLong())
+                val secondKeyCode = mKeys.getOrNull(secondKeyIndex)?.code
+                if (secondKeyCode != null) {
+                    mOnKeyboardActionListener!!.onPress(secondKeyCode)
+                }
 
                 showPreview(NOT_A_KEY)
                 invalidateKey(mCurrentKey)