diff --git a/util/build.c b/util/build.c
index 7f141a1..1eeec4d 100644
--- a/util/build.c
+++ b/util/build.c
@@ -1142,7 +1142,11 @@ void DoCommand(const char *l) {
 		CallSystem("mv bin/installer_archive.dat root/Installer\\ Data/archive.dat");
 		CallSystem("mv bin/installer_metadata.dat root/Installer\\ Data/metadata.dat");
 	} else if (0 == strcmp(l, "font-editor")) {
+#ifdef __MSYS__
+		BUILD_UTILITY("font_editor", "-Wl,-subsystem,windows -Wno-unused-parameter -mwindows", "");
+#else
 		BUILD_UTILITY("font_editor", "-lX11 -Wno-unused-parameter", "");
+#endif
 		CallSystem("bin/font_editor res/Fonts/Bitmap\\ Sans\\ Regular\\ 9.font");
 	} else if (0 == strcmp(l, "config")) {
 #ifdef __MSYS__
diff --git a/util/font_editor.c b/util/font_editor.c
index f6eaa21..cac8d06 100644
--- a/util/font_editor.c
+++ b/util/font_editor.c
@@ -5,7 +5,11 @@
 // TODO Extensions: binary search, shifting glyphs in editor, undo/redo.
 
 #define UI_IMPLEMENTATION
+#ifdef __MSYS__
+#define UI_WINDOWS
+#else
 #define UI_LINUX
+#endif
 #include "luigi.h"
 
 #include <stdio.h>