diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index 93d4cd4491..c64eb1e22e 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -459,7 +459,7 @@ static void EmuThread(std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi
   bool init_controllers = false;
   if (!g_controller_interface.IsInit())
   {
-    g_controller_interface.Initialize(wsi.display_connection);
+    g_controller_interface.Initialize(wsi.render_surface);
     Pad::Initialize();
     Keyboard::Initialize();
     init_controllers = true;
diff --git a/Source/Core/DolphinNoGUI/CMakeLists.txt b/Source/Core/DolphinNoGUI/CMakeLists.txt
index 2f7761789a..34890d294e 100644
--- a/Source/Core/DolphinNoGUI/CMakeLists.txt
+++ b/Source/Core/DolphinNoGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(NOT(USE_X11 OR ENABLE_HEADLESS))
+if(NOT((ENABLE_X11 AND X11_FOUND) OR ENABLE_HEADLESS))
   return()
 endif()