diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp
index d0ade69909..28a384ba9b 100755
--- a/src/clientsettingsdlg.cpp
+++ b/src/clientsettingsdlg.cpp
@@ -291,7 +291,7 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient*         pNCliP,
 
     // init driver button
 #ifdef _WIN32
-    butDriverSetup->setText ( tr ( "ASIO Setup" ) );
+    butDriverSetup->setText ( tr ( "ASIO Device Settings" ) );
 #else
     // no use for this button for MacOS/Linux right now -> hide it
     butDriverSetup->hide();
diff --git a/src/clientsettingsdlgbase.ui b/src/clientsettingsdlgbase.ui
index f4ab207ba1..65e19b4d74 100755
--- a/src/clientsettingsdlgbase.ui
+++ b/src/clientsettingsdlgbase.ui
@@ -28,36 +28,38 @@
      </property>
      <layout class="QVBoxLayout">
       <item>
-       <widget class="QLabel" name="lblSoundcardDevice">
-        <property name="text">
+       <widget class="QGroupBox" name="groupBox">
+        <property name="title">
          <string>Device</string>
         </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="cbxSoundcard">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>153</width>
-          <height>0</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="butDriverSetup">
-        <property name="text">
-         <string>Driver Setup</string>
-        </property>
-        <property name="autoDefault">
-         <bool>false</bool>
-        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <item>
+          <widget class="QComboBox" name="cbxSoundcard">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>153</width>
+             <height>0</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="butDriverSetup">
+           <property name="text">
+            <string>Driver Setup</string>
+           </property>
+           <property name="autoDefault">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
       <item>
@@ -665,8 +667,6 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>cbxSoundcard</tabstop>
-  <tabstop>butDriverSetup</tabstop>
   <tabstop>cbxLInChan</tabstop>
   <tabstop>cbxRInChan</tabstop>
   <tabstop>cbxLOutChan</tabstop>