diff --git a/inferno/src/inferno/window.cpp b/inferno/src/inferno/window.cpp
index 689385d..23a6547 100644
--- a/inferno/src/inferno/window.cpp
+++ b/inferno/src/inferno/window.cpp
@@ -185,22 +185,21 @@ namespace Inferno {
 		const char* fullscreen = m_windowProperties.fullscreen;
 		const GLFWvidmode* mode = glfwGetVideoMode(monitor);
 
-		if (strcmp(fullscreen, "windowed") == 0) {
-			monitor = nullptr;
-			// Put window in the center of the monitor
-			xPos = (mode->width - width) / 2;
-			yPos = (mode->height - height) / 2;
-		}
-
 		if (strcmp(fullscreen, "fullscreen") == 0) {
 			refresh = mode->refreshRate;
 		}
-
-		if (strcmp(fullscreen, "borderless") == 0) {
+		else if (strcmp(fullscreen, "borderless") == 0) {
 			width = mode->width;
 			height = mode->height;
 			refresh = mode->refreshRate;
 		}
+		// Default window state is windowed
+		else {
+			monitor = nullptr;
+			// Put window in the center of the monitor
+			xPos = (mode->width - width) / 2;
+			yPos = (mode->height - height) / 2;
+		}
 
 		glfwSetWindowMonitor(m_window, monitor, xPos, yPos, width, height, refresh);
 	}