diff --git a/common/video/vulkan/vulkan_context.cpp b/common/video/vulkan/vulkan_context.cpp
index 195cbfbe..bb0e6755 100644
--- a/common/video/vulkan/vulkan_context.cpp
+++ b/common/video/vulkan/vulkan_context.cpp
@@ -123,6 +123,7 @@ bool Context::init_Xlib()
     if (!instance)
         return false;
 
+    platform_name = "xlib";
     return init();
 }
 
@@ -144,6 +145,7 @@ bool Context::init_wayland()
     if (!instance)
         return false;
 
+    platform_name = "wayland";
     return init();
 }
 
diff --git a/common/video/vulkan/vulkan_context.hpp b/common/video/vulkan/vulkan_context.hpp
index 8e9d1787..abeb5bdb 100644
--- a/common/video/vulkan/vulkan_context.hpp
+++ b/common/video/vulkan/vulkan_context.hpp
@@ -55,6 +55,7 @@ class Context
     vk::PhysicalDevice physical_device;
     vk::PhysicalDeviceProperties physical_device_props;
     vk::UniqueSurfaceKHR surface;
+    std::string platform_name;
 
   private:
     bool init_vma();
diff --git a/common/video/vulkan/vulkan_swapchain.cpp b/common/video/vulkan/vulkan_swapchain.cpp
index 998291a8..3cb113d5 100644
--- a/common/video/vulkan/vulkan_swapchain.cpp
+++ b/common/video/vulkan/vulkan_swapchain.cpp
@@ -105,9 +105,13 @@ static bool vector_find(std::vector<T> haystack, T&& needle)
 vk::PresentModeKHR Swapchain::get_present_mode() {
     auto present_mode = vk::PresentModeKHR::eFifo;
 
-    if (!vsync) {
+    if (context.platform_name == "wayland")
+    {
         if (supports_mailbox)
             present_mode = vk::PresentModeKHR::eMailbox;
+    }
+
+    if (!vsync) {
         if (supports_immediate)
             present_mode = vk::PresentModeKHR::eImmediate;
     }
@@ -156,6 +160,13 @@ bool Swapchain::create()
     frames.clear();
     image_data.clear();
 
+    auto present_modes = physical_device.getSurfacePresentModesKHR(surface).value;
+    for (auto &mode : present_modes)
+    {
+        if (mode == vk::PresentModeKHR::eMailbox)
+            supports_mailbox = true;
+    }
+
     auto surface_capabilities = physical_device.getSurfaceCapabilitiesKHR(surface).value;
 
     if (desired_latency == - 1 || (int)surface_capabilities.minImageCount > desired_latency)
@@ -185,7 +196,15 @@ bool Swapchain::create()
         extents.width = desired_width;
         extents.height = desired_height;
     }
-    else if (extents.width < 1 || extents.height < 1)
+
+    extents.width = std::clamp(extents.width,
+                               surface_capabilities.minImageExtent.width,
+                               surface_capabilities.maxImageExtent.width);
+    extents.height = std::clamp(extents.height,
+                                surface_capabilities.minImageExtent.height,
+                                surface_capabilities.maxImageExtent.height);
+
+    if (extents.width < 1 || extents.height < 1)
     {
         // Surface is likely hidden
         printf("Extents too small.\n");
@@ -193,15 +212,6 @@ bool Swapchain::create()
         return false;
     }
 
-    if (extents.width > surface_capabilities.maxImageExtent.width)
-        extents.width = surface_capabilities.maxImageExtent.width;
-    if (extents.height > surface_capabilities.maxImageExtent.height)
-        extents.height = surface_capabilities.maxImageExtent.height;
-    if (extents.width < surface_capabilities.minImageExtent.width)
-        extents.width = surface_capabilities.minImageExtent.width;
-    if (extents.height < surface_capabilities.minImageExtent.height)
-        extents.height = surface_capabilities.minImageExtent.height;
-
     auto swapchain_create_info = vk::SwapchainCreateInfoKHR{}
         .setMinImageCount(num_swapchain_images)
         .setImageFormat(vk::Format::eB8G8R8A8Unorm)