diff --git a/PokemonGo-UWP/Views/MainPage.xaml.cs b/PokemonGo-UWP/Views/MainPage.xaml.cs
index f9bbd1ba8..960a2f7ff 100644
--- a/PokemonGo-UWP/Views/MainPage.xaml.cs
+++ b/PokemonGo-UWP/Views/MainPage.xaml.cs
@@ -13,10 +13,10 @@ public MainPage()
 
         private void passwordBox_KeyDown(object sender, Windows.UI.Xaml.Input.KeyRoutedEventArgs e)
         {
-            if (e.Key == Windows.System.VirtualKey.Enter && loginButton.Command.CanExecute(null) == true)
+            if (e.Key == Windows.System.VirtualKey.Enter)
             {
-                loginButton.Command.Execute(null);
-            }
+				loginButton.Focus(Windows.UI.Xaml.FocusState.Programmatic);
+			}
         }
     }
 }
\ No newline at end of file