diff --git a/src/main/python/keyboard_comm.py b/src/main/python/keyboard_comm.py
index 8bf6391..6086b17 100644
--- a/src/main/python/keyboard_comm.py
+++ b/src/main/python/keyboard_comm.py
@@ -643,7 +643,17 @@ class Keyboard:
         return [self.macro_deserialize(x) for x in macros]
 
     def qmk_settings_query(self):
-        raise NotImplementedError
+        cur = 0
+        supported_settings = []
+        while cur != 0xFFFF:
+            data = self.usb_send(self.dev, struct.pack("<BBH", CMD_VIA_VIAL_PREFIX, CMD_VIAL_QMK_SETTINGS_QUERY, cur),
+                                 retries=20)
+            for x in range(0, len(data), 2):
+                qsid = int.from_bytes(data[x:x+2], byteorder="little")
+                cur = max(cur, qsid)
+                if qsid != 0xFFFF:
+                    supported_settings.append(qsid)
+        return supported_settings
 
     def qmk_settings_get(self, qsid):
         data = self.usb_send(self.dev, struct.pack("<BBH", CMD_VIA_VIAL_PREFIX, CMD_VIAL_QMK_SETTINGS_GET, qsid),
diff --git a/src/main/python/qmk_settings.py b/src/main/python/qmk_settings.py
index 039661a..c18e466 100644
--- a/src/main/python/qmk_settings.py
+++ b/src/main/python/qmk_settings.py
@@ -124,6 +124,9 @@ class QmkSettings(BasicEditor):
             self.tabs.append(self.populate_tab(tab, container))
 
     def reload_settings(self):
+        settings = self.keyboard.qmk_settings_query()
+        print(settings)
+
         for tab in self.tabs:
             for field in tab:
                 field.reload(self.keyboard)