diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java
index 977ba302d..bff49a6d7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java
@@ -79,6 +79,10 @@ public class WatchXPlusDeviceCoordinator extends AbstractDeviceCoordinator {
             return DeviceType.WATCHXPLUS;
         } else if (deviceName.equalsIgnoreCase("WATCH XPLUS")) {
             return DeviceType.WATCHXPLUS;
+            // add initial support for Watch X non-plus (forces Watch X to be recognized as Watch XPlus)
+            // Watch X non-plus have same MAC address as Watch 9 (starts with "1C:87:79")
+        } else if (deviceName.equalsIgnoreCase("WATCH X")) {
+            return DeviceType.WATCHXPLUS;
         }
         return DeviceType.UNKNOWN;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java
index 18b0a8844..08d8d1d04 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java
@@ -63,7 +63,8 @@ public class Watch9DeviceCoordinator extends AbstractDeviceCoordinator {
         String deviceName = candidate.getName().toUpperCase();
         if (candidate.supportsService(Watch9Constants.UUID_SERVICE_WATCH9)) {
             return DeviceType.WATCH9;
-        } else if (macAddress.startsWith("1C:87:79")) {
+            // add support for Watch X non-plus (same MAC address)
+        } else if ((macAddress.startsWith("1C:87:79")) && (!deviceName.equalsIgnoreCase("WATCH X"))) {
             return DeviceType.WATCH9;
         } else if (deviceName.equals("WATCH 9")) {
             return DeviceType.WATCH9;
diff --git a/app/src/main/res/xml/watchxplus_preferences.xml b/app/src/main/res/xml/watchxplus_preferences.xml
index 68348e7d7..7be6108e9 100644
--- a/app/src/main/res/xml/watchxplus_preferences.xml
+++ b/app/src/main/res/xml/watchxplus_preferences.xml
@@ -39,7 +39,7 @@
             android:key="pref_category_watchxplus_callhandling"
             android:title="@string/pref_header_wxp_notification_callhandling">
             <PreferenceCategory
-                android:title="@string/pref_header_wxp_longsit"/>
+                android:title="@string/pref_header_wxp_notification_callhandling"/>
             <CheckBoxPreference
                 android:layout="@layout/preference_checkbox"
                 android:defaultValue="false"