diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff6d9a8..de4e4ba 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,9 @@ endif ()
 
 # Build configuration - Linux
 if (UNIX)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -s")
+  if (NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -s")
+  endif ()
   set(CMAKE_SHARED_LINKER_FLAGS "--as-needed")
 endif ()
 
diff --git a/src/launcher.c b/src/launcher.c
index f31763a..3b8e0bc 100755
--- a/src/launcher.c
+++ b/src/launcher.c
@@ -221,7 +221,7 @@ static void create_window()
                  SDL_WINDOWPOS_UNDEFINED,
                  0,
                  0,
-                 SDL_WINDOW_FULLSCREEN_DESKTOP | SDL_WINDOW_BORDERLESS
+                 SDL_WINDOW_FULLSCREEN_DESKTOP
              );
     if (window == NULL)
         log_fatal("Could not create SDL Window\n%s", SDL_GetError());