diff --git a/Source/Client/Browser/BrowserAddressEdit.cpp b/Source/Client/Browser/BrowserAddressEdit.cpp
index 2b1ff593..94fe0ee0 100644
--- a/Source/Client/Browser/BrowserAddressEdit.cpp
+++ b/Source/Client/Browser/BrowserAddressEdit.cpp
@@ -15,15 +15,19 @@ void __fastcall sub_AB20F0(BSTR* address) {
 // OFFSET: 0x00AB21F0
 // FUNCTION: fn_17412
 LRESULT CALLBACK BrowserAddressEditProc(HWND window, UINT message, WPARAM value, LPARAM flags) {
-  if (value == VK_RETURN) {
-    if (message == WM_KEYUP || message == WM_CHAR) {
-      return 0;
-    }
-
-    if (message == WM_KEYDOWN && g_windowMgr.activeBrowser) {
+  switch (message) {
+  case WM_KEYDOWN:
+    if (value == VK_RETURN && g_windowMgr.activeBrowser) {
       SendMessageA(g_windowMgr.activeBrowser->host, WM_COMMAND, static_cast<WPARAM>(BrowserCommand::Navigate), 0);
       return 0;
     }
+    break;
+  case WM_KEYUP:
+  case WM_CHAR:
+    if (value == VK_RETURN) {
+      return 0;
+    }
+    break;
   }
 
   return CallWindowProcA(lpPrevWndFunc, window, message, value, flags);