diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 97db634..12f5023 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -167,6 +167,7 @@
     <string name="double_tap_to_sleep_summary">Double tap on the status bar to put the device to sleep</string>
 
     <!-- Lockscreen double tap to sleep -->
+    <string name="lockscreen_gesture_title">Gestures</string>
     <string name="double_tap_sleep_lockscreen_title">Lockscreen double tap to sleep</string>
     <string name="double_tap_sleep_lockscreen_summary">Double tap anywhere on the lockscreen to put the device to sleep</string>
 	
diff --git a/res/xml/cherish_settings_gestures.xml b/res/xml/cherish_settings_gestures.xml
index 98211da..e72f6a0 100644
--- a/res/xml/cherish_settings_gestures.xml
+++ b/res/xml/cherish_settings_gestures.xml
@@ -17,17 +17,5 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/gestures_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-	
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="double_tap_sleep_lockscreen"
-            android:title="@string/double_tap_sleep_lockscreen_title"
-            android:summary="@string/double_tap_sleep_lockscreen_summary"
-            android:defaultValue="true" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="double_tap_sleep_gesture"
-            android:title="@string/double_tap_to_sleep_title"
-            android:summary="@string/double_tap_to_sleep_summary"
-            android:defaultValue="true" />
 
 </PreferenceScreen>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index b5cd60f..dbe4a3b 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -18,6 +18,17 @@
     android:title="@string/lockscreen_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 	
+	<PreferenceCategory
+        android:title="@string/lockscreen_gesture_title">
+	
+	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="double_tap_sleep_lockscreen"
+            android:title="@string/double_tap_sleep_lockscreen_title"
+            android:summary="@string/double_tap_sleep_lockscreen_summary"
+            android:defaultValue="true" />
+			
+	</PreferenceCategory>
+	
 	<PreferenceCategory
         android:key="lockscreen_media_art_options"
         android:title="@string/lockscreen_media_art_options_title">
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index 690bc20..7f5b87a 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -15,6 +15,18 @@
     android:title="@string/statusbar_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 	
+	
+	<PreferenceCategory
+        android:title="@string/lockscreen_gesture_title">
+	
+	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="double_tap_sleep_gesture"
+            android:title="@string/double_tap_to_sleep_title"
+            android:summary="@string/double_tap_to_sleep_summary"
+            android:defaultValue="true" />
+			
+	</PreferenceCategory>
+	
 	<Preference
         android:key="network_traffic_settings"
         android:title="@string/network_traffic_title"