diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 955ee220..4bd05931 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -50,8 +50,10 @@
             a:key="viewRefresh"
             a:title="@string/settings.view_refresh" />
     </PreferenceCategory>
-    <PreferenceCategory a:title="@string/settings.playback_control_title" >
-        <CheckBoxPreference
+    <PreferenceCategory
+        a:title="@string/settings.playback_control_title"
+        a:key="playbackControlSettings">
+    <CheckBoxPreference
             a:defaultValue="false"
             a:key="useId3Tags"
             a:summary="@string/settings.use_id3_summary"
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java
index 4fde7cc9..eac51d83 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java
@@ -180,7 +180,6 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 		directoryCacheTime = (ListPreference) findPreference(Constants.PREFERENCES_KEY_DIRECTORY_CACHE_TIME);
 		mediaButtonsEnabled = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_MEDIA_BUTTONS);
 		lockScreenEnabled = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_SHOW_LOCK_SCREEN_CONTROLS);
-		CheckBoxPreference gaplessPlaybackEnabled = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_GAPLESS_PLAYBACK);
 		sendBluetoothAlbumArt = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_SEND_BLUETOOTH_ALBUM_ART);
 		sendBluetoothNotifications = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_SEND_BLUETOOTH_NOTIFICATIONS);
 		viewRefresh = (ListPreference) findPreference(Constants.PREFERENCES_KEY_VIEW_REFRESH);
@@ -209,10 +208,18 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
 		{
+			PreferenceCategory playbackControlSettings = (PreferenceCategory) findPreference(Constants.PREFERENCES_KEY_PLAYBACK_CONTROL_SETTINGS);
+			CheckBoxPreference gaplessPlaybackEnabled = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_GAPLESS_PLAYBACK);
+
 			if (gaplessPlaybackEnabled != null)
 			{
 				gaplessPlaybackEnabled.setChecked(false);
 				gaplessPlaybackEnabled.setEnabled(false);
+
+				if (playbackControlSettings != null)
+				{
+					playbackControlSettings.removePreference(gaplessPlaybackEnabled);
+				}
 			}
 		}
 
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java b/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java
index c779e3f8..44aa3978 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java
@@ -106,6 +106,7 @@ public final class Constants
 	public static final String PREFERENCES_KEY_DEFAULT_ARTISTS = "defaultArtists";
 	public static final String PREFERENCES_KEY_SHOW_NOW_PLAYING = "showNowPlaying";
 	public static final String PREFERENCES_KEY_GAPLESS_PLAYBACK = "gaplessPlayback";
+	public static final String PREFERENCES_KEY_PLAYBACK_CONTROL_SETTINGS = "playbackControlSettings";
 	public static final String PREFERENCES_KEY_CLEAR_SEARCH_HISTORY = "clearSearchHistory";
 	public static final String PREFERENCES_KEY_TEST_CONNECTION = "testConnection";
 	public static final String PREFERENCES_KEY_DOWNLOAD_TRANSITION = "transitionToDownloadOnPlay";