diff --git a/src/engine.cpp b/src/engine.cpp
index 0abae30..e8b4c70 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -49,7 +49,7 @@ void Engine::createWindow(std::string title,
 {
     m_window = new sf::Window(sf::VideoMode(w, h),
                               title,
-                              isWindowed ? sf::Style::Close : sf::Style::None,
+                              isWindowed ? sf::Style::Close : sf::Style::Fullscreen,
                               sf::ContextSettings(24, 8, 0, 3, 3, sf::ContextSettings::Attribute::Core));
     m_window->setFramerateLimit(60);
     m_input = new Input(m_window);
diff --git a/src/test/main.cpp b/src/test/main.cpp
index 80b5453..9fdd001 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -150,7 +150,7 @@ int main(int argc, char** argv){
 
     // this creates the opengl context
     // the opengl context must exist before any opengl class is used (texture, pipeline, etc..)
-    if(mode == FULLSCREEN_DEMO && mode == SPONZA_TEST)
+    if(mode == FULLSCREEN_DEMO || mode == SPONZA_TEST)
     {
         engine.createWindow("Sparrow Engine Testing Environment", 1920, 1080, true);
         engine.toggleMouseVisibility();