diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2257db5..5c00385 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,9 +93,10 @@ add_subdirectory("libs/minizip-ng")
 if(NOT EMSCRIPTEN)
   add_custom_command(
       OUTPUT "${PROJECT_SOURCE_DIR}/fonts/embedded_font.inc"
-      COMMAND binary_to_compressed_c -base85 "${PROJECT_SOURCE_DIR}/fonts/mononoki-Regular Nerd Font Complete.ttf" MononokiFont > ${PROJECT_SOURCE_DIR}/fonts/embedded_font.inc
+      COMMAND binary_to_compressed_c -base85 "fonts/mononoki-Regular Nerd Font Complete.ttf" MononokiFont > ${PROJECT_SOURCE_DIR}/fonts/embedded_font.inc
       COMMENT "Embedding font..."
       MAIN_DEPENDENCY "fonts/mononoki-Regular Nerd Font Complete.ttf"
+      WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
       VERBATIM)
 endif()
 
diff --git a/main_glfw.cpp b/main_glfw.cpp
index a2e3d81..2dc4dc3 100644
--- a/main_glfw.cpp
+++ b/main_glfw.cpp
@@ -125,7 +125,9 @@ int main(int argc, char** argv)
     //io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;      // Enable Gamepad Controls
     io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;           // Enable Docking
     io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;         // Enable Multi-Viewport / Platform Windows
+#if !defined(__linux__)
     io.ConfigViewportsNoAutoMerge = true;
+#endif
     //io.ConfigViewportsNoTaskBarIcon = true;
 
     // Setup Dear ImGui style