diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
index 60b69435a7..c225f5d4ba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
@@ -205,6 +205,9 @@ public class PebbleCoordinator extends AbstractBLClassicDeviceCoordinator {
     public DeviceSpecificSettings getDeviceSpecificSettings(final GBDevice device) {
         final DeviceSpecificSettings deviceSpecificSettings = new DeviceSpecificSettings();
 
+        final List<Integer> generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC);
+        generic.add(R.xml.devicesettings_pebble_generic);
+
         final List<Integer> notifications = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CALLS_AND_NOTIFICATIONS);
         notifications.add(R.xml.devicesettings_autoremove_notifications);
         notifications.add(R.xml.devicesettings_pebble_calls_notifications);
diff --git a/app/src/main/res/xml/devicesettings_pebble_developer.xml b/app/src/main/res/xml/devicesettings_pebble_developer.xml
index 9a8990646a..973568d856 100644
--- a/app/src/main/res/xml/devicesettings_pebble_developer.xml
+++ b/app/src/main/res/xml/devicesettings_pebble_developer.xml
@@ -41,13 +41,5 @@
             android:summary="@string/pref_summary_pebble_always_ack_pebblekit"
             android:title="@string/pref_title_pebble_always_ack_pebblekit"
             app:iconSpaceReserved="false" />
-        <SwitchPreferenceCompat
-            android:defaultValue="false"
-            android:dependency="pebble_force_untested"
-            android:key="pebble_enable_background_javascript"
-            android:layout="@layout/preference_checkbox"
-            android:summary="@string/pref_summary_pebble_enable_bgjs"
-            android:title="@string/pref_title_pebble_enable_bgjs"
-            app:iconSpaceReserved="false" />
     </PreferenceCategory>
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_pebble_generic.xml b/app/src/main/res/xml/devicesettings_pebble_generic.xml
new file mode 100644
index 0000000000..d6ef66ed88
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_pebble_generic.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="pebble_enable_background_javascript"
+        android:layout="@layout/preference_checkbox"
+        android:summary="@string/pref_summary_pebble_enable_bgjs"
+        android:title="@string/pref_title_pebble_enable_bgjs"
+        app:iconSpaceReserved="false" />
+</androidx.preference.PreferenceScreen>