diff --git a/src/ui/activities/auth/mod.rs b/src/ui/activities/auth/mod.rs
index 3b48d5e..723ad46 100644
--- a/src/ui/activities/auth/mod.rs
+++ b/src/ui/activities/auth/mod.rs
@@ -168,18 +168,18 @@ impl Activity for AuthActivity {
         if let Err(err) = enable_raw_mode() {
             error!("Failed to enter raw mode: {}", err);
         }
+        // Initialize view
+        self.init();
         // Init bookmarks client
         if self.bookmarks_client.is_none() {
             self.init_bookmarks_client();
         }
+        // If check for updates is enabled, check for updates
+        self.check_for_updates();
         // Verify error state from context
         if let Some(err) = self.context.as_mut().unwrap().get_error() {
             self.mount_error(err.as_str());
         }
-        // If check for updates is enabled, check for updates
-        self.check_for_updates();
-        // Initialize view
-        self.init();
         info!("Activity initialized");
     }
 
diff --git a/src/ui/activities/auth/update.rs b/src/ui/activities/auth/update.rs
index cc8f17d..ae9a153 100644
--- a/src/ui/activities/auth/update.rs
+++ b/src/ui/activities/auth/update.rs
@@ -223,6 +223,13 @@ impl AuthActivity {
                     self.umount_bookmark_del_dialog();
                     None
                 }
+                // Error message
+                (COMPONENT_TEXT_ERROR, &MSG_KEY_ENTER) | (COMPONENT_TEXT_ERROR, &MSG_KEY_ESC) => {
+                    // Umount text error
+                    self.umount_error();
+                    None
+                }
+                (COMPONENT_TEXT_ERROR, _) => None,
                 // Help
                 (_, &MSG_KEY_CTRL_H) => {
                     // Show help
@@ -286,12 +293,6 @@ impl AuthActivity {
                     self.umount_bookmark_save_dialog();
                     None
                 }
-                // Error message
-                (COMPONENT_TEXT_ERROR, &MSG_KEY_ENTER) => {
-                    // Umount text error
-                    self.umount_error();
-                    None
-                }
                 // Quit dialog
                 (COMPONENT_RADIO_QUIT, Msg::OnSubmit(Payload::One(Value::Usize(choice)))) => {
                     // If choice is 0, quit termscp