diff --git a/client/galaxy/scripts/components/login/Login.vue b/client/galaxy/scripts/components/login/Login.vue
index 840c5f772ac..d91f4bac083 100644
--- a/client/galaxy/scripts/components/login/Login.vue
+++ b/client/galaxy/scripts/components/login/Login.vue
@@ -3,13 +3,13 @@
         <div class="row justify-content-md-center">
             <div class="col col-lg-6">
                 <b-alert :show="messageShow" :variant="messageVariant" v-html="messageText"/>
-                <b-form @submit.prevent="submit()">
+                <b-form id="login" @submit.prevent="submit()">
                     <b-card header="Welcome to Galaxy, please log in">
                         <b-form-group label="Username or Email Address">
-                            <b-form-input type="text" v-model="login"/>
+                            <b-form-input name="login" type="text" v-model="login"/>
                         </b-form-group>
                         <b-form-group label="Password">
-                            <b-form-input type="password" v-model="password"/>
+                            <b-form-input name="password" type="password" v-model="password"/>
                             <b-form-text>Forgot password? Click here to <a @click="reset" href="#">reset</a> your password.</b-form-text>
                         </b-form-group>
                         <b-button type="submit">Login</b-button>
diff --git a/test/galaxy_selenium/navigates_galaxy.py b/test/galaxy_selenium/navigates_galaxy.py
index d7f116bc5d2..3856880a246 100644
--- a/test/galaxy_selenium/navigates_galaxy.py
+++ b/test/galaxy_selenium/navigates_galaxy.py
@@ -376,12 +376,11 @@ class NavigatesGalaxy(HasDriver):
         self.click_masthead_user()
         self.wait_for_and_click(self.navigation.masthead.labels.login)
 
-        with self.main_panel():
-            self.sleep_for(WAIT_TYPES.UX_RENDER)
-            form = self.wait_for_visible(self.navigation.login.selectors.form)
-            self.fill(form, login_info)
-            self.snapshot("logging-in")
-            self.click_submit(form)
+        self.sleep_for(WAIT_TYPES.UX_RENDER)
+        form = self.wait_for_visible(self.navigation.login.selectors.form)
+        self.fill(form, login_info)
+        self.snapshot("logging-in")
+        self.wait_for_and_click(self.navigation.login.selectors.submit)
 
         self.snapshot("login-submitted")
         if assert_valid:
diff --git a/test/galaxy_selenium/navigation.yml b/test/galaxy_selenium/navigation.yml
index 35159d4a9e9..879a7253a77 100644
--- a/test/galaxy_selenium/navigation.yml
+++ b/test/galaxy_selenium/navigation.yml
@@ -205,7 +205,10 @@ histories:
 
 login:
   selectors:
-     form: 'form#login'
+    form: 'form#login'
+    submit:
+      type: xpath
+      selector: "//button[@type='submit']"
 
 registration:
   selectors:
diff --git a/test/selenium_tests/test_login.py b/test/selenium_tests/test_login.py
index cbdac4fc3d1..4a954450c7f 100644
--- a/test/selenium_tests/test_login.py
+++ b/test/selenium_tests/test_login.py
@@ -13,8 +13,7 @@ class LoginTestCase(SeleniumTestCase):
         self.logout_if_needed()
         self.home()
         self.submit_login(email, assert_valid=True)
-        with self.main_panel():
-            self.assert_no_error_message()
+        self.assert_no_error_message()
         assert self.is_logged_in()
 
     @selenium_test
@@ -23,8 +22,7 @@ class LoginTestCase(SeleniumTestCase):
         for bad_email in bad_emails:
             self.home()
             self.submit_login(bad_email, assert_valid=False)
-            with self.main_panel():
-                self.assert_error_message()
+            self.assert_error_message()
 
     @selenium_test
     def test_invalid_passwords(self):
@@ -32,8 +30,7 @@ class LoginTestCase(SeleniumTestCase):
         for bad_password in bad_passwords:
             self.home()
             self.submit_login(self._get_random_email(), password=bad_password, assert_valid=False)
-            with self.main_panel():
-                self.assert_error_message()
+            self.assert_error_message()
 
     @selenium_test
     def test_wrong_password(self):
@@ -42,5 +39,4 @@ class LoginTestCase(SeleniumTestCase):
         self.logout_if_needed()
         self.home()
         self.submit_login(email, password="12345678", assert_valid=False)
-        with self.main_panel():
-            self.assert_error_message()
+        self.assert_error_message()