diff --git a/AudioManager/AudioManager.cpp b/AudioManager/AudioManager.cpp
index 8f8c565..d1d2dcc 100644
--- a/AudioManager/AudioManager.cpp
+++ b/AudioManager/AudioManager.cpp
@@ -49,15 +49,16 @@ std::vector<Device> parseDevices(const std::string &output)
             if (deviceStarted) {
                 devices.push_back(currentDevice);
             }
-            currentDevice = Device{-1, "", ""};
+            currentDevice = Device{-1, "", "", false};
             deviceStarted = true;
             currentDevice.index = std::stoi(line.substr(line.find(":") + 2));
         } else if (line.find("Name") != std::string::npos) {
-            std::string_view lineView(line);
-            currentDevice.name = std::string(lineView.substr(lineView.find(":") + 2));
+            currentDevice.name = line.substr(line.find(":") + 2);
         } else if (line.find("Type") != std::string::npos) {
-            std::string_view lineView(line);
-            currentDevice.type = std::string(lineView.substr(lineView.find(":") + 2));
+            currentDevice.type = line.substr(line.find(":") + 2);
+        } else if (line.find("Default") != std::string::npos) {
+            std::string defaultValue = line.substr(line.find(":") + 2);
+            currentDevice.isDefault = (defaultValue == "True");
         }
     }
 
@@ -90,6 +91,20 @@ bool checkDevice(const std::string &deviceName)
     return false;
 }
 
+std::string AudioManager::getDefaultOutputDevice()
+{
+    std::string output = executeCommand("Get-AudioDevice -l");
+    std::vector<Device> devices = parseDevices(output);
+
+    for (const auto &device : devices) {
+        if (device.type == "Playback" && device.isDefault) {
+            return device.name;
+        }
+    }
+
+    return "";
+}
+
 void AudioManager::setAudioDevice(const std::string &deviceName)
 {
     bool deviceFound = false;
diff --git a/AudioManager/AudioManager.h b/AudioManager/AudioManager.h
index fe5e24a..e504f4d 100644
--- a/AudioManager/AudioManager.h
+++ b/AudioManager/AudioManager.h
@@ -8,12 +8,14 @@ struct Device
     int index;
     std::string name;
     std::string type;
+    bool isDefault = false;
 };
 
 namespace AudioManager
 {
     void setAudioDevice(const std::string &deviceName);
     void detectNewOutputs();
+    std::string getDefaultOutputDevice();
 };
 
 #endif // AUDIOMANAGER_H
diff --git a/BigPictureTV/BigPictureTV.cpp b/BigPictureTV/BigPictureTV.cpp
index 73945cc..bcda792 100644
--- a/BigPictureTV/BigPictureTV.cpp
+++ b/BigPictureTV/BigPictureTV.cpp
@@ -78,6 +78,9 @@ void BigPictureTV::checkWindowTitle()
     }
 
     if (isRunning && !gamemodeActive) {
+        if (autodetect_desktop) {
+            currentAudioOutputName = AudioManager::getDefaultOutputDevice();
+        }
         gamemodeActive = true;
         handleActions(false);
         handleMonitorChanges(false, disable_monitor_switch);
@@ -124,6 +127,10 @@ void BigPictureTV::handleAudioChanges(bool isDesktopMode, bool disableAudio)
         return;
     }
 
+    if (autodetect_desktop && isDesktopMode) {
+        AudioManager::setAudioDevice(currentAudioOutputName);
+    }
+
     QString audioDevice = isDesktopMode ? desktop_audio_device
                                             : gamemode_audio_device;
 
@@ -207,6 +214,7 @@ void BigPictureTV::loadSettings()
     target_window_mode = settings.value("target_window_mode").toInt();
     custom_window_title = settings.value("custom_window_title").toString();
     autodetect_HDMI = settings.value("autodetect_hdmi").toBool();
+    autodetect_desktop = settings.value("autodetect_desktop").toBool();
 
     qDebug() << "Audio configuration:";
     qDebug() << "";
diff --git a/BigPictureTV/BigPictureTV.h b/BigPictureTV/BigPictureTV.h
index 77c79e2..835433b 100644
--- a/BigPictureTV/BigPictureTV.h
+++ b/BigPictureTV/BigPictureTV.h
@@ -59,6 +59,8 @@ private slots:
     bool disable_nightlight_action;
     bool target_window_mode;
     bool autodetect_HDMI;
+    bool autodetect_desktop;
+    std::string currentAudioOutputName;
     QSettings settings;
     bool gamemodeActive;
 };
diff --git a/Configurator/Configurator.cpp b/Configurator/Configurator.cpp
index b33acf9..8b8fe3b 100644
--- a/Configurator/Configurator.cpp
+++ b/Configurator/Configurator.cpp
@@ -25,7 +25,7 @@ Configurator::Configurator(QWidget *parent)
     ui->actionsFrame->setVisible(false);
     ui->advancedFrame->setVisible(false);
     Utils::setFrameColorBasedOnWindow(this, ui->frame);
-    this->setFixedSize(356, 224);
+    this->setFixedSize(382, 224);
     setupConnections();
     getAudioCapabilities();
 }
@@ -50,6 +50,7 @@ void Configurator::setupConnections()
     connect(ui->actionsButton, &QPushButton::clicked, this, &Configurator::setActionsTab);
     connect(ui->advancedButton, &QPushButton::clicked, this, &Configurator::setAdvancedTab);
     connect(ui->autodetectCheckBox, &QCheckBox::checkStateChanged, this, &Configurator::onAutodetectCheckBoxStateChanged);
+    connect(ui->autodetectDesktopCheckBox, &QCheckBox::checkStateChanged, this, &Configurator::onAutodetectDesktopCheckBoxStateChanged);
 
     ui->startupCheckBox->setChecked(ShortcutManager::isShortcutPresent("BigPictureTV.lnk"));
     initDiscordAction();
@@ -82,6 +83,9 @@ void Configurator::getAudioCapabilities()
         if (ui->autodetectCheckBox->isChecked()) {
             ui->gamemodeAudioLineEdit->setEnabled(false);
         }
+        if (ui->autodetectDesktopCheckBox->isChecked()) {
+            ui->desktopAudioLineEdit->setEnabled(false);
+        }
     }
 }
 
@@ -121,6 +125,14 @@ void Configurator::onAutodetectCheckBoxStateChanged(Qt::CheckState state)
     }
 }
 
+void Configurator::onAutodetectDesktopCheckBoxStateChanged(Qt::CheckState state)
+{
+    bool isChecked = (state == Qt::Checked);
+    if (!ui->disableAudioCheckBox->isChecked()) {
+        ui->desktopAudioLineEdit->setDisabled(isChecked);
+    }
+}
+
 void Configurator::onTargetWindowComboBoxIndexChanged(int index)
 {
     if (index == 1) {
@@ -210,11 +222,13 @@ void Configurator::loadSettings()
     ui->customWindowLineEdit->setText(settings.value("custom_window_title", "").toString());
     ui->targetWindowComboBox->setCurrentIndex(settings.value("target_window_mode", 0).toInt());
     ui->autodetectCheckBox->setChecked(settings.value("autodetect_hdmi", false).toBool());
+    ui->autodetectDesktopCheckBox->setChecked(settings.value("autodetect_desktop", false).toBool());
 
     toggleAudioSettings(!ui->disableAudioCheckBox->isChecked());
     toggleMonitorSettings(!ui->disableMonitorCheckBox->isChecked());
     toggleCustomWindowTitle(ui->targetWindowComboBox->currentIndex() == 1);
     ui->gamemodeAudioLineEdit->setDisabled(ui->autodetectCheckBox->isChecked());
+    ui->desktopAudioLineEdit->setDisabled(ui->autodetectDesktopCheckBox->isChecked());
 }
 
 void Configurator::saveSettings()
@@ -233,6 +247,7 @@ void Configurator::saveSettings()
     settings.setValue("target_window_mode", ui->targetWindowComboBox->currentIndex());
     settings.setValue("custom_window_title", ui->customWindowLineEdit->text());
     settings.setValue("autodetect_hdmi", ui->autodetectCheckBox->isChecked());
+    settings.setValue("autodetect_desktop", ui->autodetectDesktopCheckBox->isChecked());
 }
 
 void Configurator::toggleAudioSettings(bool state)
diff --git a/Configurator/Configurator.h b/Configurator/Configurator.h
index eb429ac..df59917 100644
--- a/Configurator/Configurator.h
+++ b/Configurator/Configurator.h
@@ -26,6 +26,7 @@ private slots:
     void onDisableAudioCheckboxStateChanged(Qt::CheckState state);
     void onDisableMonitorCheckboxStateChanged(Qt::CheckState state);
     void onAutodetectCheckBoxStateChanged(Qt::CheckState state);
+    void onAutodetectDesktopCheckBoxStateChanged(Qt::CheckState state);
     void onTargetWindowComboBoxIndexChanged(int index);
     void onAudioButtonClicked();
     void setGeneralTab();
diff --git a/Configurator/Configurator.ui b/Configurator/Configurator.ui
index 018762f..7953bf5 100644
--- a/Configurator/Configurator.ui
+++ b/Configurator/Configurator.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>356</width>
-    <height>590</height>
+    <width>379</width>
+    <height>592</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -218,33 +218,21 @@
           <property name="spacing">
            <number>6</number>
           </property>
-          <item row="2" column="3">
-           <widget class="QSpinBox" name="checkrateSpinBox">
+          <item row="3" column="0">
+           <widget class="QLabel" name="customWindowLabel">
             <property name="minimumSize">
              <size>
-              <width>90</width>
+              <width>0</width>
               <height>25</height>
              </size>
             </property>
-            <property name="frame">
-             <bool>true</bool>
-            </property>
-            <property name="minimum">
-             <number>100</number>
-            </property>
-            <property name="maximum">
-             <number>1000</number>
-            </property>
-            <property name="singleStep">
-             <number>100</number>
-            </property>
-            <property name="value">
-             <number>1000</number>
+            <property name="text">
+             <string>Custom window title</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="0" colspan="4">
-           <widget class="QPushButton" name="resetSettingsButton">
+          <item row="4" column="0">
+           <widget class="QLabel" name="checkrateLabel">
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -252,22 +240,38 @@
              </size>
             </property>
             <property name="text">
-             <string>Reset default settings</string>
+             <string>Window check rate</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="2" colspan="2">
-           <widget class="QComboBox" name="targetWindowComboBox">
+          <item row="2" column="1">
+           <spacer name="horizontalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Orientation::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="targetWindowLabel">
             <property name="minimumSize">
              <size>
               <width>0</width>
               <height>25</height>
              </size>
             </property>
+            <property name="text">
+             <string>Target window</string>
+            </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="checkrateLabel">
+          <item row="5" column="0" colspan="5">
+           <widget class="QPushButton" name="resetSettingsButton">
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -275,37 +279,96 @@
              </size>
             </property>
             <property name="text">
-             <string>Window check rate</string>
+             <string>Reset default settings</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="targetWindowLabel">
+          <item row="4" column="4">
+           <widget class="QSpinBox" name="checkrateSpinBox">
             <property name="minimumSize">
              <size>
-              <width>0</width>
+              <width>90</width>
               <height>25</height>
              </size>
             </property>
-            <property name="text">
-             <string>Target window</string>
+            <property name="frame">
+             <bool>true</bool>
+            </property>
+            <property name="minimum">
+             <number>100</number>
+            </property>
+            <property name="maximum">
+             <number>1000</number>
+            </property>
+            <property name="singleStep">
+             <number>100</number>
+            </property>
+            <property name="value">
+             <number>1000</number>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="customWindowLabel">
+          <item row="1" column="0" colspan="5">
+           <layout class="QGridLayout" name="gridLayout_3">
+            <item row="1" column="1">
+             <widget class="QCheckBox" name="autodetectCheckBox">
+              <property name="layoutDirection">
+               <enum>Qt::LayoutDirection::RightToLeft</enum>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="2">
+             <widget class="QLabel" name="label_2">
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>25</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Autodetect desktop audio</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label">
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>25</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Autodetect gamemode audio</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="3">
+             <widget class="QCheckBox" name="autodetectDesktopCheckBox">
+              <property name="layoutDirection">
+               <enum>Qt::LayoutDirection::RightToLeft</enum>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="3" column="2" colspan="3">
+           <widget class="QLineEdit" name="customWindowLineEdit">
             <property name="minimumSize">
              <size>
               <width>0</width>
               <height>25</height>
              </size>
             </property>
-            <property name="text">
-             <string>Custom window title</string>
-            </property>
            </widget>
           </item>
-          <item row="2" column="2">
+          <item row="4" column="2" colspan="2">
            <spacer name="horizontalSpacer">
             <property name="minimumSize">
              <size>
@@ -324,8 +387,8 @@
             </property>
            </spacer>
           </item>
-          <item row="1" column="2" colspan="2">
-           <widget class="QLineEdit" name="customWindowLineEdit">
+          <item row="2" column="2" colspan="3">
+           <widget class="QComboBox" name="targetWindowComboBox">
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -334,19 +397,6 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <spacer name="horizontalSpacer_4">
-            <property name="orientation">
-             <enum>Qt::Orientation::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
          </layout>
         </widget>
        </item>
@@ -652,29 +702,6 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="label">
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>25</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>Autodetect TV HDMI audio</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="3">
-           <widget class="QCheckBox" name="autodetectCheckBox">
-            <property name="layoutDirection">
-             <enum>Qt::LayoutDirection::RightToLeft</enum>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>