diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index ff7669d0c..ddf57cb75 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -1221,7 +1221,7 @@ input.icon-checkbox {
 }
 
 .input-group-combo {
-    select {
+    select:first-of-type {
         &.alone {
             border-radius: .25rem !important;
         }
@@ -1235,11 +1235,12 @@ input.icon-checkbox {
     .input-group {
         padding: 0 !important;
         flex: 2;
+    }
 
-        :first-child {
-            border-top-left-radius: 0;
-            border-bottom-left-radius: 0;
-        }
+    select + select,
+    .input-group :first-child {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
     }
 }
 
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 03350aa3f..bdc082ecc 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -935,7 +935,7 @@ function rcube_elastic_ui()
         // Input-group combo is an element with a select field on the left
         // and input(s) on right, and where the whole right side can be hidden
         // depending on the select position. This code fixes border radius on select
-        $('.input-group-combo > select', context).on('change', function() {
+        $('.input-group-combo > select:first', context).on('change', function() {
             var select = $(this),
                 fn = function() {
                     select[select.next().is(':visible') ? 'removeClass' : 'addClass']('alone');