diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp
index fecd70a31..aec2e7a5d 100644
--- a/src/qt_gui/main_window.cpp
+++ b/src/qt_gui/main_window.cpp
@@ -202,7 +202,7 @@ void MainWindow::CreateConnects() {
             &MainWindow::StartGame);
 
     connect(ui->settingsButton, &QPushButton::clicked, this, [this]() {
-        auto settingsDialog = new SettingsDialog(this, &m_physical_devices);
+        auto settingsDialog = new SettingsDialog(m_physical_devices, this);
         settingsDialog->exec();
     });
 
diff --git a/src/qt_gui/settings_dialog.cpp b/src/qt_gui/settings_dialog.cpp
index 06840416b..bde0eadab 100644
--- a/src/qt_gui/settings_dialog.cpp
+++ b/src/qt_gui/settings_dialog.cpp
@@ -4,7 +4,7 @@
 #include "settings_dialog.h"
 #include "ui_settings_dialog.h"
 
-SettingsDialog::SettingsDialog(QWidget* parent, std::vector<QString>* physical_devices)
+SettingsDialog::SettingsDialog(std::span<const QString> physical_devices, QWidget* parent)
     : QDialog(parent), ui(new Ui::SettingsDialog) {
     ui->setupUi(this);
     ui->tabWidgetSettings->setUsesScrollButtons(false);
@@ -14,8 +14,8 @@ SettingsDialog::SettingsDialog(QWidget* parent, std::vector<QString>* physical_d
 
     // Add list of available GPUs
     ui->graphicsAdapterBox->addItem("Auto Select"); // -1, auto selection
-    for (auto device = physical_devices->begin(); device != physical_devices->end(); ++device) {
-        ui->graphicsAdapterBox->addItem(*device);
+    for (const auto& device : physical_devices) {
+        ui->graphicsAdapterBox->addItem(device);
     }
 
     LoadValuesFromConfig();
diff --git a/src/qt_gui/settings_dialog.h b/src/qt_gui/settings_dialog.h
index a796a6042..73a81258e 100644
--- a/src/qt_gui/settings_dialog.h
+++ b/src/qt_gui/settings_dialog.h
@@ -5,6 +5,7 @@
 
 #include <QDialog>
 #include <QPushButton>
+#include <span>
 
 #include "common/config.h"
 #include "common/path_util.h"
@@ -16,8 +17,7 @@ class SettingsDialog;
 class SettingsDialog : public QDialog {
     Q_OBJECT
 public:
-    explicit SettingsDialog(QWidget* parent = nullptr,
-                            std::vector<QString>* physical_devices = nullptr);
+    explicit SettingsDialog(std::span<const QString> physical_devices, QWidget* parent = nullptr);
     ~SettingsDialog();
 
     int exec() override;