diff --git a/dist/qt_themes/default/style.qss b/dist/qt_themes/default/style.qss
index 701086299d..c56ca54ce3 100644
--- a/dist/qt_themes/default/style.qss
+++ b/dist/qt_themes/default/style.qss
@@ -2,6 +2,12 @@ QAbstractSpinBox {
     min-height: 19px;
 }
 
+QComboBox {
+  padding: 0px 4px 0px 4px;
+  min-width: 60px;
+  min-height: 19px;
+}
+
 QPushButton#TogglableStatusBarButton {
     color: #959595;
     border: 1px solid transparent;
diff --git a/dist/qt_themes/default_dark/style.qss b/dist/qt_themes/default_dark/style.qss
index dd224c3322..9f8de4c5b8 100644
--- a/dist/qt_themes/default_dark/style.qss
+++ b/dist/qt_themes/default_dark/style.qss
@@ -6,6 +6,12 @@ QAbstractSpinBox {
     min-height: 19px;
 }
 
+QComboBox {
+  padding: 0px 4px 0px 4px;
+  min-width: 60px;
+  min-height: 19px;
+}
+
 QPushButton#TogglableStatusBarButton {
     color: #959595;
     border: 1px solid transparent;
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp
index 58478059a4..9d21759240 100644
--- a/src/yuzu/configuration/configure_audio.cpp
+++ b/src/yuzu/configuration/configure_audio.cpp
@@ -126,6 +126,7 @@ void ConfigureAudio::Setup(const ConfigurationShared::Builder& builder) {
                 restore_output_device_button->setVisible(
                     !Settings::values.audio_output_device_id.UsingGlobal());
                 widget->layout()->addWidget(restore_output_device_button);
+
                 connect(restore_output_device_button, &QAbstractButton::clicked, [this](bool) {
                     Settings::values.audio_output_device_id.SetGlobal(true);
                     SetOutputDevicesFromDeviceID();
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index b7fc98d637..2d76a774f6 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -507,7 +507,7 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
     created = true;
     const auto type = setting.TypeId();
 
-    QLayout* layout = new QHBoxLayout(this);
+    QHBoxLayout* layout = new QHBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
 
     if (other_setting == nullptr) {
@@ -574,10 +574,10 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
     if (require_checkbox) {
         QWidget* lhs =
             CreateCheckBox(other_setting, label, checkbox_serializer, checkbox_restore_func, touch);
-        layout->addWidget(lhs);
+        layout->addWidget(lhs, 1);
     } else if (setting.TypeId() != typeid(bool)) {
         QLabel* qt_label = CreateLabel(label);
-        layout->addWidget(qt_label);
+        layout->addWidget(qt_label, 1);
     }
 
     if (setting.TypeId() == typeid(bool)) {
@@ -649,7 +649,7 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
         return;
     }
 
-    layout->addWidget(data_component);
+    layout->addWidget(data_component, 1);
 
     if (!managed) {
         return;