diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java
index b16f5d0e..b2f1eba8 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java
@@ -54,6 +54,8 @@ class MainLayoutNumpad extends BaseMainLayout {
 				|| keyId == R.id.soft_key_lf4
 				|| keyId == R.id.soft_key_0
 				|| keyId == R.id.soft_key_100
+				|| keyId == R.id.soft_key_punctuation_101
+				|| keyId == R.id.soft_key_punctuation_102
 				|| keyId == R.id.soft_key_punctuation_201
 				|| keyId == R.id.soft_key_punctuation_202
 			) {
@@ -85,6 +87,8 @@ class MainLayoutNumpad extends BaseMainLayout {
 				|| keyId == R.id.soft_key_lf4
 				|| keyId == R.id.soft_key_0
 				|| keyId == R.id.soft_key_100
+				|| keyId == R.id.soft_key_punctuation_101
+				|| keyId == R.id.soft_key_punctuation_102
 				|| keyId == R.id.soft_key_punctuation_201
 				|| keyId == R.id.soft_key_punctuation_202
 			) {
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/BaseClickableKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/BaseClickableKey.java
index 7adee99f..e0150bd5 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/BaseClickableKey.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/BaseClickableKey.java
@@ -139,7 +139,7 @@ public class BaseClickableKey extends com.google.android.material.button.Materia
 
 
 	protected boolean handlePress() {
-		if (validateTT9Handler()) {
+		if (validateTT9Handler() && getVisibility() == VISIBLE) {
 			vibrate(Vibration.getPressVibration(this));
 		}