diff --git a/src/Magnum/Vk/DeviceProperties.cpp b/src/Magnum/Vk/DeviceProperties.cpp
index 2794993da..d9cf5952d 100644
--- a/src/Magnum/Vk/DeviceProperties.cpp
+++ b/src/Magnum/Vk/DeviceProperties.cpp
@@ -193,8 +193,8 @@ const VkPhysicalDeviceProperties2& DeviceProperties::properties() {
         Containers::Reference<void*> next = _state->properties.pNext;
 
         /* Fetch driver properties, if supported */
-        if(isVersionSupported(Version::Vk12) || extensionPropertiesInternal().isSupported<Extensions::KHR::driver_properties>())
-            connect(next, _state->driverProperties, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES);
+        if(isOrVersionSupportedInternal<Extensions::KHR::driver_properties>())
+            Implementation::structureConnect(next, _state->driverProperties, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES);
 
         _state->getPropertiesImplementation(*this, _state->properties);
     }
@@ -231,6 +231,11 @@ const ExtensionProperties& DeviceProperties::extensionPropertiesInternal() {
     return *_state->extensions;
 }
 
+template<class E> bool DeviceProperties::isOrVersionSupportedInternal() {
+    if(isVersionSupported(E::coreVersion())) return true;
+    return extensionPropertiesInternal().isSupported<E>();
+}
+
 Containers::ArrayView<const VkQueueFamilyProperties2> DeviceProperties::queueFamilyProperties() {
     if(!_state) _state.emplace(*_instance, _handle);
 
diff --git a/src/Magnum/Vk/DeviceProperties.h b/src/Magnum/Vk/DeviceProperties.h
index cd7a94457..2b7e7153c 100644
--- a/src/Magnum/Vk/DeviceProperties.h
+++ b/src/Magnum/Vk/DeviceProperties.h
@@ -631,6 +631,11 @@ class MAGNUM_VK_EXPORT DeviceProperties {
            function. */
         MAGNUM_VK_LOCAL const ExtensionProperties& extensionPropertiesInternal();
 
+        /* Combines isVersionSupported(E::coreVersion()) and
+           ExtensionProperties::isSupported<E>(). Used internally to avoid
+           accidents with incorrectly specified extension core version. */
+        template<class E> MAGNUM_VK_LOCAL bool isOrVersionSupportedInternal();
+
         MAGNUM_VK_LOCAL static void getPropertiesImplementationDefault(DeviceProperties& self, VkPhysicalDeviceProperties2& properties);
         MAGNUM_VK_LOCAL static void getPropertiesImplementationKHR(DeviceProperties& self, VkPhysicalDeviceProperties2& properties);
         MAGNUM_VK_LOCAL static void getPropertiesImplementation11(DeviceProperties& self, VkPhysicalDeviceProperties2& properties);