diff --git a/scripts/generate_vk_helpers.py b/scripts/generate_vk_helpers.py
index 6f75dfed9..7c074c724 100755
--- a/scripts/generate_vk_helpers.py
+++ b/scripts/generate_vk_helpers.py
@@ -246,16 +246,18 @@ def get_instance_cmds():
     ]
 
 
+# Sorted KHR, EXT, Vendor, interally alphabetically
 INSTANCE_EXTENSIONS_TO_CHECK = [
     "VK_EXT_display_surface_counter",
 ]
+# Sorted KHR, EXT, Vendor, interally alphabetically
 DEVICE_EXTENSIONS_TO_CHECK = [
     "VK_KHR_timeline_semaphore",
     "VK_EXT_calibrated_timestamps",
+    "VK_EXT_display_control",
     "VK_EXT_global_priority",
     "VK_EXT_robustness2",
     "VK_GOOGLE_display_timing",
-    "VK_EXT_display_control",
 ]
 
 ROOT = Path(__file__).resolve().parent.parent
diff --git a/src/xrt/auxiliary/vk/vk_bundle_init.c b/src/xrt/auxiliary/vk/vk_bundle_init.c
index 7c0ce646f..c09b661db 100644
--- a/src/xrt/auxiliary/vk/vk_bundle_init.c
+++ b/src/xrt/auxiliary/vk/vk_bundle_init.c
@@ -518,10 +518,10 @@ fill_in_has_device_extensions(struct vk_bundle *vk, struct u_string_list *ext_li
 	// Reset before filling out.
 	vk->has_KHR_timeline_semaphore = false;
 	vk->has_EXT_calibrated_timestamps = false;
+	vk->has_EXT_display_control = false;
 	vk->has_EXT_global_priority = false;
 	vk->has_EXT_robustness2 = false;
 	vk->has_GOOGLE_display_timing = false;
-	vk->has_EXT_display_control = false;
 
 	const char *const *exts = u_string_list_get_data(ext_list);
 	uint32_t ext_count = u_string_list_get_size(ext_list);
@@ -543,6 +543,13 @@ fill_in_has_device_extensions(struct vk_bundle *vk, struct u_string_list *ext_li
 		}
 #endif // defined(VK_EXT_calibrated_timestamps)
 
+#if defined(VK_EXT_display_control)
+		if (strcmp(ext, VK_EXT_DISPLAY_CONTROL_EXTENSION_NAME) == 0) {
+			vk->has_EXT_display_control = true;
+			continue;
+		}
+#endif // defined(VK_EXT_display_control)
+
 #if defined(VK_EXT_global_priority)
 		if (strcmp(ext, VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME) == 0) {
 			vk->has_EXT_global_priority = true;
@@ -563,13 +570,6 @@ fill_in_has_device_extensions(struct vk_bundle *vk, struct u_string_list *ext_li
 			continue;
 		}
 #endif // defined(VK_GOOGLE_display_timing)
-
-#if defined(VK_EXT_display_control)
-		if (strcmp(ext, VK_EXT_DISPLAY_CONTROL_EXTENSION_NAME) == 0) {
-			vk->has_EXT_display_control = true;
-			continue;
-		}
-#endif // defined(VK_EXT_display_control)
 	}
 	// end of GENERATED device extension code - do not modify - used by scripts
 }
diff --git a/src/xrt/auxiliary/vk/vk_helpers.h b/src/xrt/auxiliary/vk/vk_helpers.h
index a5732e2c7..34c5342e1 100644
--- a/src/xrt/auxiliary/vk/vk_helpers.h
+++ b/src/xrt/auxiliary/vk/vk_helpers.h
@@ -87,10 +87,10 @@ struct vk_bundle
 	// beginning of GENERATED device extension code - do not modify - used by scripts
 	bool has_KHR_timeline_semaphore;
 	bool has_EXT_calibrated_timestamps;
+	bool has_EXT_display_control;
 	bool has_EXT_global_priority;
 	bool has_EXT_robustness2;
 	bool has_GOOGLE_display_timing;
-	bool has_EXT_display_control;
 	// end of GENERATED device extension code - do not modify - used by scripts
 
 	struct