diff --git a/src/utils/updater/UpdateDialog.cpp b/src/utils/updater/UpdateDialog.cpp
index 12a7656..c7aab33 100644
--- a/src/utils/updater/UpdateDialog.cpp
+++ b/src/utils/updater/UpdateDialog.cpp
@@ -69,6 +69,7 @@ void UpdateDialog::noUpdateAvailable() {
 void UpdateDialog::updateAvailable() {
     m_waitingTimer.stop();
     ui->frame->show();
+    ui->btn_download->setFocus();
     ui->btn_installUpdate->hide();
     ui->btn_restart->hide();
     ui->progressBar->hide();
@@ -134,6 +135,7 @@ void UpdateDialog::onDownloadFinished() {
     this->setStatus("Download finished and verified.", true);
 
     ui->btn_installUpdate->show();
+    ui->btn_installUpdate->setFocus();
     ui->progressBar->hide();
 
     m_updateZipArchive = responseStr;
@@ -246,6 +248,7 @@ void UpdateDialog::onInstallUpdate() {
         this->setStatus("Installation successful. Do you want to restart Feather now?");
     }
     ui->btn_restart->show();
+    ui->btn_restart->setFocus();
 }
 
 void UpdateDialog::installUpdateMac() {
diff --git a/src/utils/updater/UpdateDialog.ui b/src/utils/updater/UpdateDialog.ui
index 3c12c1d..6a848cf 100644
--- a/src/utils/updater/UpdateDialog.ui
+++ b/src/utils/updater/UpdateDialog.ui
@@ -79,6 +79,9 @@
           <property name="text">
            <string>Cancel</string>
           </property>
+          <property name="autoDefault">
+           <bool>false</bool>
+          </property>
          </widget>
         </item>
         <item>
@@ -86,6 +89,9 @@
           <property name="text">
            <string>Download</string>
           </property>
+          <property name="default">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
         <item>
@@ -93,6 +99,9 @@
           <property name="text">
            <string>Install Update</string>
           </property>
+          <property name="default">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
         <item>
@@ -100,6 +109,9 @@
           <property name="text">
            <string>Restart Feather</string>
           </property>
+          <property name="default">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
        </layout>