diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 6ee110869..6b98a0d28 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -108,8 +108,8 @@ add_library(core STATIC
     frontend/framebuffer_layout.h
     frontend/image_interface.h
     frontend/input.h
-    frontend/mic.h
     frontend/mic.cpp
+    frontend/mic.h
     frontend/scope_acquire_context.cpp
     frontend/scope_acquire_context.h
     gdbstub/gdbstub.cpp
diff --git a/src/core/frontend/scope_acquire_window_context.cpp b/src/core/frontend/scope_acquire_window_context.cpp
new file mode 100644
index 000000000..cb2520ca4
--- /dev/null
+++ b/src/core/frontend/scope_acquire_window_context.cpp
@@ -0,0 +1,18 @@
+// Copyright 2019 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "core/frontend/emu_window.h"
+#include "core/frontend/scope_acquire_window_context.h"
+
+namespace Frontend {
+
+ScopeAcquireWindowContext::ScopeAcquireWindowContext(Frontend::EmuWindow& emu_window_)
+    : emu_window{emu_window_} {
+    emu_window.MakeCurrent();
+}
+ScopeAcquireWindowContext::~ScopeAcquireWindowContext() {
+    emu_window.DoneCurrent();
+}
+
+} // namespace Frontend
diff --git a/src/core/frontend/scope_acquire_window_context.h b/src/core/frontend/scope_acquire_window_context.h
new file mode 100644
index 000000000..12c13e15e
--- /dev/null
+++ b/src/core/frontend/scope_acquire_window_context.h
@@ -0,0 +1,23 @@
+// Copyright 2019 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "common/common_types.h"
+
+namespace Frontend {
+
+class EmuWindow;
+
+/// Helper class to acquire/release window context within a given scope
+class ScopeAcquireWindowContext : NonCopyable {
+public:
+    explicit ScopeAcquireWindowContext(Frontend::EmuWindow& window);
+    ~ScopeAcquireWindowContext();
+
+private:
+    Frontend::EmuWindow& emu_window;
+};
+
+} // namespace Frontend