diff --git a/src/core/gpu_backend.cpp b/src/core/gpu_backend.cpp
index 6cfcc936d..a574ab22a 100644
--- a/src/core/gpu_backend.cpp
+++ b/src/core/gpu_backend.cpp
@@ -325,7 +325,7 @@ void GPUBackend::ReleaseQueuedFrame()
   if (s_cpu_thread_state.wait_state.compare_exchange_strong(expected, CPUThreadState::WAIT_GPU_THREAD_SIGNALING,
                                                             std::memory_order_acq_rel, std::memory_order_acquire))
   {
-    if (g_settings.gpu_max_queued_frames > 0)
+    if (g_gpu_settings.gpu_max_queued_frames > 0)
       DEV_LOG("--> Unblocking CPU thread");
 
     s_cpu_thread_state.gpu_thread_wait.Post();
diff --git a/src/util/imgui_fullscreen.cpp b/src/util/imgui_fullscreen.cpp
index 1a98b70ed..ac88b9d5f 100644
--- a/src/util/imgui_fullscreen.cpp
+++ b/src/util/imgui_fullscreen.cpp
@@ -3148,7 +3148,7 @@ void ImGuiFullscreen::FileSelectorDialog::Draw()
   }
   else
   {
-    if (ImGui::IsKeyPressed(ImGuiKey_Backspace, false) || ImGui::IsKeyPressed(ImGuiKey_NavGamepadMenu, false))
+    if (ImGui::IsKeyPressed(ImGuiKey_Backspace, false) || ImGui::IsKeyPressed(ImGuiKey_NavGamepadInput, false))
     {
       if (!m_items.empty() && m_first_item_is_parent_directory)
         SetDirectory(std::move(m_items.front().full_path));