diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/AppearanceScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/AppearanceScreen.java
index 3d3ed0e0..58953d3d 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/AppearanceScreen.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/AppearanceScreen.java
@@ -24,19 +24,16 @@ public class AppearanceScreen extends BaseScreenFragment {
 
 	private void createMainSection() {
 		(new ItemStatusIcon(findPreference(ItemStatusIcon.NAME), activity.getSettings())).populate();
-		ItemHapticFeedback hapticFeedback = (new ItemHapticFeedback(findPreference(ItemHapticFeedback.NAME), activity.getSettings())).populate();
 
 		ItemNumpadAlignment numpadAlignment = new ItemNumpadAlignment(findPreference(ItemNumpadAlignment.NAME), activity.getSettings());
 		ItemNumpadKeyHeight numpadKeyHeight = new ItemNumpadKeyHeight(findPreference(ItemNumpadKeyHeight.NAME), activity.getSettings());
 
-
 		ItemDropDown[] items = {
 			new ItemSelectTheme(findPreference(ItemSelectTheme.NAME), activity),
 			new ItemSelectLayoutType(
 				findPreference(ItemSelectLayoutType.NAME),
 				activity,
 				(layout) -> {
-					hapticFeedback.onLayoutChange(layout);
 					numpadKeyHeight.onLayoutChange(layout);
 					numpadAlignment.onLayoutChange(layout);
 				}),
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemHapticFeedback.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/ItemHapticFeedback.java
similarity index 89%
rename from app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemHapticFeedback.java
rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/ItemHapticFeedback.java
index 6225ce25..a532d0bd 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemHapticFeedback.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/ItemHapticFeedback.java
@@ -1,4 +1,4 @@
-package io.github.sspanak.tt9.preferences.screens.appearance;
+package io.github.sspanak.tt9.preferences.screens.keypad;
 
 import androidx.annotation.NonNull;
 import androidx.preference.Preference;
@@ -26,7 +26,7 @@ class ItemHapticFeedback extends ItemClickable {
 		return this;
 	}
 
-	void onLayoutChange(int mainViewLayout) {
+	private void onLayoutChange(int mainViewLayout) {
 		if (item != null) {
 			item.setEnabled(mainViewLayout == SettingsStore.LAYOUT_NUMPAD || mainViewLayout == SettingsStore.LAYOUT_SMALL);
 			((SwitchPreferenceCompat) item).setChecked(settings.getHapticFeedback());
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/KeyPadScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/KeyPadScreen.java
index 05f8535b..6dea4cd2 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/KeyPadScreen.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/KeyPadScreen.java
@@ -16,6 +16,8 @@ public class KeyPadScreen extends BaseScreenFragment {
 
 	@Override
 	protected void onCreate() {
+		(new ItemHapticFeedback(findPreference(ItemHapticFeedback.NAME), activity.getSettings())).populate().enableClickHandler();
+
 		ItemDropDown[] items = {
 			new ItemSelectZeroKeyCharacter(findPreference(ItemSelectZeroKeyCharacter.NAME), activity),
 			new ItemSelectABCAutoAccceptTime(findPreference(ItemSelectABCAutoAccceptTime.NAME), activity),
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index ddf9134e..e48fd3f3 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -142,7 +142,7 @@
 	<string name="voice_input_error_no_network">Няма връзка с интернет</string>
 	<string name="voice_input_error_network_failed">Проблем с мрежовата връзка</string>
 	<string name="voice_input_stopping">Изключване на микрофона…</string>
-	<string name="pref_haptic_feedback_summary">Вибрация при натискане на виртуален клавиш</string>
+	<string name="pref_haptic_feedback_summary">Вибрация при натискане на виртуален клавиш.</string>
 	<string name="pref_haptic_feedback">Вибрация</string>
 	<string name="pref_numpad_alignment">Подравняване в пейзажен режим</string>
 	<string name="virtual_numpad_alignment_center">В средата</string>
diff --git a/app/src/main/res/xml/prefs_screen_appearance.xml b/app/src/main/res/xml/prefs_screen_appearance.xml
index 74ce316b..ea4a6912 100644
--- a/app/src/main/res/xml/prefs_screen_appearance.xml
+++ b/app/src/main/res/xml/prefs_screen_appearance.xml
@@ -15,11 +15,6 @@
 		app:title="@string/pref_layout" />
 
 	<PreferenceCategory app:title="@string/pref_layout_numpad">
-		<SwitchPreferenceCompat
-			app:key="pref_haptic_feedback"
-			app:title="@string/pref_haptic_feedback"
-			app:summary="@string/pref_haptic_feedback_summary"/>
-
 		<DropDownPreference
 			app:key="pref_numpad_key_height"
 			app:title="@string/pref_numpad_key_height" />
diff --git a/app/src/main/res/xml/prefs_screen_keypad.xml b/app/src/main/res/xml/prefs_screen_keypad.xml
index 979828a5..ac94681b 100644
--- a/app/src/main/res/xml/prefs_screen_keypad.xml
+++ b/app/src/main/res/xml/prefs_screen_keypad.xml
@@ -15,6 +15,11 @@
 		app:summary="@string/pref_upside_down_keys_summary"
 		app:title="@string/pref_upside_down_keys" />
 
+	<SwitchPreferenceCompat
+			app:key="pref_haptic_feedback"
+			app:title="@string/pref_haptic_feedback"
+			app:summary="@string/pref_haptic_feedback_summary"/>
+
 	<PreferenceCategory android:title="@string/pref_category_predictive_mode">
 
 		<SwitchPreferenceCompat