diff --git a/src/gui/TotpSetupDialog.cpp b/src/gui/TotpSetupDialog.cpp
index 69290e7a3..babeb7840 100644
--- a/src/gui/TotpSetupDialog.cpp
+++ b/src/gui/TotpSetupDialog.cpp
@@ -46,6 +46,8 @@ void TotpSetupDialog::saveSettings()
     uint digits = Totp::DEFAULT_DIGITS;
     if (m_ui->radio8Digits->isChecked()) {
         digits = 8;
+    } else if (m_ui->radio7Digits->isChecked()) {
+        digits = 7;
     } else if (m_ui->radioSteam->isChecked()) {
         digits = Totp::STEAM_DIGITS;
         encShortName = Totp::STEAM_SHORTNAME;
@@ -75,6 +77,8 @@ void TotpSetupDialog::init()
             m_ui->radioCustom->setChecked(true);
             if (settings->digits == 8) {
                 m_ui->radio8Digits->setChecked(true);
+            } else if (settings->digits == 7) {
+                m_ui->radio7Digits->setChecked(true);
             } else {
                 m_ui->radio6Digits->setChecked(true);
             }
diff --git a/src/gui/TotpSetupDialog.ui b/src/gui/TotpSetupDialog.ui
index 7b3e9318b..6f2af49f1 100644
--- a/src/gui/TotpSetupDialog.ui
+++ b/src/gui/TotpSetupDialog.ui
@@ -153,6 +153,13 @@
        </widget>
       </item>
       <item row="3" column="1">
+       <widget class="QRadioButton" name="radio7Digits">
+        <property name="text">
+         <string>7 digits</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
        <widget class="QRadioButton" name="radio8Digits">
         <property name="text">
          <string>8 digits</string>