diff --git a/data/web/css/build/014-responsive.css b/data/web/css/build/014-responsive.css
index 2085568a..9ddfdd69 100644
--- a/data/web/css/build/014-responsive.css
+++ b/data/web/css/build/014-responsive.css
@@ -161,6 +161,12 @@
     display: flex;
     flex-wrap: wrap;
   }
+  .btn-group.nowrap {
+    flex-wrap: nowrap;
+  }
+  .btn-group.nowrap .dropdown-menu {
+    width: 100%;
+  }
   .panel-login .btn-group {
     display: block;
   }
diff --git a/data/web/templates/admin/tab-config-admins.twig b/data/web/templates/admin/tab-config-admins.twig
index d3e0823e..d7c17c8b 100644
--- a/data/web/templates/admin/tab-config-admins.twig
+++ b/data/web/templates/admin/tab-config-admins.twig
@@ -68,8 +68,8 @@
       </div>
       <div class="row">
         <div class="col-sm-offset-3 col-sm-9">
-          <div class="btn-group">
-            <button class="btn btn-sm btn-xs-lg btn-primary" id="register-fido2">{{ lang.fido2.set_fido2 }}</button>
+          <div class="btn-group nowrap">
+            <button class="btn btn-sm btn-primary visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline" id="register-fido2">{{ lang.fido2.set_fido2 }}</button>
             <button type="button" class="btn btn-sm btn-xs-lg btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
               <span class="caret"></span>
             </button>
diff --git a/data/web/templates/user/tab-user-auth.twig b/data/web/templates/user/tab-user-auth.twig
index f7875995..58174ea8 100644
--- a/data/web/templates/user/tab-user-auth.twig
+++ b/data/web/templates/user/tab-user-auth.twig
@@ -52,7 +52,7 @@
       </div>
       <div class="row">
         <div class="col-sm-offset-3 col-sm-9">
-          <div class="btn-group">
+          <div class="btn-group nowrap">
             <button class="btn btn-sm btn-primary visible-xs-block visible-sm-inline visible-md-inline visible-lg-inline" id="register-fido2">{{ lang.fido2.set_fido2 }}</button>
             <button type="button" class="btn btn-sm btn-xs-lg btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
               <span class="caret"></span>