diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 34b28ec9a6..876f74df00 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1938,7 +1938,11 @@ static void NetworkCompanyPasswordWindowWndProc(Window *w, WindowEvent *e)
 		case WE_KEYPRESS:
 			switch (HandleEditBoxKey(w, &WP(w, chatquerystr_d), 4, e)) {
 				case 1: // Return
-					/* FALLTHROUGH */
+					e->event = WE_CLICK;
+					e->we.click.widget = NCPWW_OK;
+					NetworkCompanyPasswordWindowWndProc(w, e);
+					break;
+
 				case 2: // Escape
 					DeleteWindow(w);
 					break;
diff --git a/src/strings.cpp b/src/strings.cpp
index d1a067b588..9a5f72e395 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -33,7 +33,6 @@
 #include "vehicle.h"
 #include "newgrf_engine.h"
 #include "spritecache.h"
-#undef WITH_FREETYPE
 #include "fontcache.h"
 #include "gui.h"