diff --git a/res/values/evolution_strings.xml b/res/values/evolution_strings.xml
index f643317..be86b0b 100644
--- a/res/values/evolution_strings.xml
+++ b/res/values/evolution_strings.xml
@@ -121,6 +121,9 @@
     <string name="quick_settings_lock_screen_category">Lock screen</string>
     <string name="quick_settings_secure_lock_screen_title">Hide on secure lock screen</string>
     <string name="quick_settings_secure_lock_screen_summary">Hide all quick settings in the notification shade while the device is locked</string>
+    <string name="quick_settings_miscellaneous_category">Miscellaneous</string>
+    <string name="quick_settings_bluetooth_show_dialog_title">Bluetooth tile dialog</string>
+    <string name="quick_settings_bluetooth_show_dialog_summary">Show bluetooth dialog or toggle bluetooth state on tapping bluetooth tile</string>
 
     <!-- Notifications -->
     <string name="notifications_interface_category">Interface</string>
diff --git a/res/xml/evolution_settings_quick_settings.xml b/res/xml/evolution_settings_quick_settings.xml
index ef76ec3..a4948ea 100644
--- a/res/xml/evolution_settings_quick_settings.xml
+++ b/res/xml/evolution_settings_quick_settings.xml
@@ -20,4 +20,16 @@
             android:summary="@string/quick_settings_secure_lock_screen_summary"
             android:defaultValue="false" />
     </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="quick_settings_miscellaneous_category"
+        android:title="@string/quick_settings_miscellaneous_category">
+
+        <!-- QS Bluetooth Dialog -->
+        <org.evolution.settings.preferences.SystemSettingSwitchPreference
+            android:key="qs_bt_show_dialog"
+            android:title="@string/quick_settings_bluetooth_show_dialog_title"
+            android:summary="@string/quick_settings_bluetooth_show_dialog_summary"
+            android:defaultValue="true" />
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/org/evolution/settings/fragments/quicksettings/QuickSettings.java b/src/org/evolution/settings/fragments/quicksettings/QuickSettings.java
index 45f0726..48b5f99 100644
--- a/src/org/evolution/settings/fragments/quicksettings/QuickSettings.java
+++ b/src/org/evolution/settings/fragments/quicksettings/QuickSettings.java
@@ -23,11 +23,17 @@ import com.android.settingslib.search.SearchIndexable;
 
 import java.util.List;
 
+import org.evolution.settings.utils.DeviceUtils;
+
 @SearchIndexable
 public class QuickSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
 
     private static final String TAG = "QuickSettings";
+    private static final String KEY_MISCELLANEOUS_CATEGORY = "quick_settings_miscellaneous_category";
+    private static final String KEY_QS_BLUETOOTH_SHOW_DIALOG = "qs_bt_show_dialog";
+
+    private PreferenceCategory mMiscellaneousCategory;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -38,6 +44,12 @@ public class QuickSettings extends SettingsPreferenceFragment implements
         final ContentResolver resolver = context.getContentResolver();
         final PreferenceScreen prefScreen = getPreferenceScreen();
         final Resources resources = context.getResources();
+
+        mMiscellaneousCategory = (PreferenceCategory) findPreference(KEY_MISCELLANEOUS_CATEGORY);
+
+        if (!DeviceUtils.deviceSupportsBluetooth(context)) {
+            prefScreen.removePreference(mMiscellaneousCategory);
+        }
     }
 
     @Override
@@ -59,6 +71,10 @@ public class QuickSettings extends SettingsPreferenceFragment implements
             public List<String> getNonIndexableKeys(Context context) {
                 List<String> keys = super.getNonIndexableKeys(context);
                 final Resources resources = context.getResources();
+
+                if (!DeviceUtils.deviceSupportsBluetooth(context)) {
+                    keys.add(KEY_QS_BLUETOOTH_SHOW_DIALOG);
+                }
                 return keys;
             }
         };