diff --git a/src/authdialog.cpp b/src/authdialog.cpp
index 11bd9a0..07f9e26 100644
--- a/src/authdialog.cpp
+++ b/src/authdialog.cpp
@@ -632,7 +632,7 @@ void AuthDialog::setFocusin(int target)
             m_messageButton->setStyleSheet("QPushButton{background-color: rgba(255,255,255,15%); border-radius: 4px; border: 2px solid #2C73C8;}");
             break;
         default:
-            if(m_widgetLoginOpts)
+            if(m_passwordEdit)
                 m_passwordEdit->setFocusin(target);
             m_widgetLoginOpts->tabOptionSelected(2);
             break;
diff --git a/src/lockwidget.cpp b/src/lockwidget.cpp
index cafeb59..f648e24 100644
--- a/src/lockwidget.cpp
+++ b/src/lockwidget.cpp
@@ -1862,7 +1862,7 @@ bool LockWidget::exitSubWidget()
         allExited = false;
         return allExited;
     }
-    if(tabAt != LINEEDIT)
+    if(tabAt != LINEEDIT && tabAt != MESSAGEBTN && tabAt != ENTERBTN && tabAt != BIOBTN)
         authDialog->setFocusin(REMOVE);
     return allExited;
 }