diff --git a/src/res/qml/audio_page/AudioPage.qml b/src/res/qml/audio_page/AudioPage.qml
index b1761a3..e6214e1 100644
--- a/src/res/qml/audio_page/AudioPage.qml
+++ b/src/res/qml/audio_page/AudioPage.qml
@@ -116,7 +116,9 @@ MyStackViewPage {
                     }
                 }
             }
-
+        }
+        ColumnLayout {
+            spacing: 18
             MyToggleButton {
                 id: audioMuteProximitySensorToggle
                 Layout.preferredWidth: 600
@@ -252,50 +254,50 @@ MyStackViewPage {
                 }
             }
             RowLayout {
-                spacing: 18
+            spacing: 18
 
-                MyPushButton {
-                    id: audioDeleteProfileButton
-                    enabled: true
-                    Layout.preferredWidth: 200
-                    text: "Delete Profile"
-                    onClicked: {
-                        if (audioProfileComboBox.currentIndex > 0) {
-                            audioDeleteProfileDialog.profileIndex = audioProfileComboBox.currentIndex - 1
-                            audioDeleteProfileDialog.open()
-                        }
-                    }
-                }
-                MyPushButton {
-                    Layout.preferredWidth: 200
-                    text: "New Profile"
-                    onClicked: {
-                        audioNewProfileDialog.openPopup()
-                    }
-                }
-                Item {
-                    Layout.fillWidth: true
-                }
-                MyPushButton {
-                    id: pttDeleteProfileButton
-                    enabled: true
-                    Layout.preferredWidth: 200
-                    text: "Delete Profile"
-                    onClicked: {
-                        if (pttProfileComboBox.currentIndex > 0) {
-                            pttDeleteProfileDialog.profileIndex = pttProfileComboBox.currentIndex - 1
-                            pttDeleteProfileDialog.open()
-                        }
-                    }
-                }
-                MyPushButton {
-                    Layout.preferredWidth: 200
-                    text: "New Profile"
-                    onClicked: {
-                        pttNewProfileDialog.openPopup()
+            MyPushButton {
+                id: audioDeleteProfileButton
+                enabled: true
+                Layout.preferredWidth: 200
+                text: "Delete Profile"
+                onClicked: {
+                    if (audioProfileComboBox.currentIndex > 0) {
+                        audioDeleteProfileDialog.profileIndex = audioProfileComboBox.currentIndex - 1
+                        audioDeleteProfileDialog.open()
                     }
                 }
             }
+            MyPushButton {
+                Layout.preferredWidth: 200
+                text: "New Profile"
+                onClicked: {
+                    audioNewProfileDialog.openPopup()
+                }
+            }
+            Item {
+                Layout.fillWidth: true
+            }
+            MyPushButton {
+                id: pttDeleteProfileButton
+                enabled: true
+                Layout.preferredWidth: 200
+                text: "Delete Profile"
+                onClicked: {
+                    if (pttProfileComboBox.currentIndex > 0) {
+                        pttDeleteProfileDialog.profileIndex = pttProfileComboBox.currentIndex - 1
+                        pttDeleteProfileDialog.open()
+                    }
+                }
+            }
+            MyPushButton {
+                Layout.preferredWidth: 200
+                text: "New Profile"
+                onClicked: {
+                    pttNewProfileDialog.openPopup()
+                }
+            }
+        }
         }
 
         Component.onCompleted: {
diff --git a/src/res/qml/audio_page/device_selector/MicDeviceSelector.qml b/src/res/qml/audio_page/device_selector/MicDeviceSelector.qml
index 9b77bbb..8f0179a 100644
--- a/src/res/qml/audio_page/device_selector/MicDeviceSelector.qml
+++ b/src/res/qml/audio_page/device_selector/MicDeviceSelector.qml
@@ -23,7 +23,7 @@ RowLayout {
         Layout.minimumWidth: 850
         Layout.preferredWidth: 850
         onActivated: {
-            if (componentCompleted) {
+            if (deviceIndex >= 0) {
                 AudioTabController.setMicDeviceIndex(currentIndex)
             }
         }