diff --git a/src/Engine/Window/Window.cpp b/src/Engine/Window/Window.cpp
index 6555cbc..35b5d35 100644
--- a/src/Engine/Window/Window.cpp
+++ b/src/Engine/Window/Window.cpp
@@ -40,14 +40,16 @@ namespace DREAM {
         m_height = height;
     }
 
-    // void Window::setFullscreen(bool enabled) {
-    //     if (enabled) {
-    //         IsWindowFullscreen();
-    //     }
-    // }
+    void Window::setFullscreen(bool enabled) {
+        if (m_fullscreen != enabled) {
+            ToggleFullscreen();
+            m_fullscreen = enabled;
+        }
+    }
 
     void Window::toggleFullscreen() {
         ToggleFullscreen();
+        m_fullscreen = !m_fullscreen;
     }
 
     void Window::setTitle(const std::string &title) {
@@ -74,7 +76,7 @@ namespace DREAM {
     // }
 
     bool Window::isFullscreen() {
-        return IsWindowFullscreen();
+        return m_fullscreen;
     }
 
     bool Window::isVSyncEnabled() {