diff --git a/OSBindings/Qt/mainwindow.cpp b/OSBindings/Qt/mainwindow.cpp
index 6eae7d315..1e36e338c 100644
--- a/OSBindings/Qt/mainwindow.cpp
+++ b/OSBindings/Qt/mainwindow.cpp
@@ -1145,6 +1145,10 @@ void MainWindow::start_msx() {
 	using Target = Analyser::Static::MSX::Target;
 	auto target = std::make_unique<Target>();
 
+	switch(ui->msxModelComboBox->currentIndex()) {
+		default:	target->model = Target::Model::MSX1;		break;
+		case 1:		target->model = Target::Model::MSX2;		break;
+	}
 	switch(ui->msxRegionComboBox->currentIndex()) {
 		default:	target->region = Target::Region::Europe;	break;
 		case 1:		target->region = Target::Region::USA;		break;
@@ -1152,6 +1156,7 @@ void MainWindow::start_msx() {
 	}
 
 	target->has_disk_drive = ui->msxDiskDriveCheckBox->isChecked();
+	target->has_msx_music = ui->msxMSXMUSICCheckBox->isChecked();
 
 	launchTarget(std::move(target));
 }
diff --git a/OSBindings/Qt/mainwindow.ui b/OSBindings/Qt/mainwindow.ui
index 511df37ea..4a0b1a731 100644
--- a/OSBindings/Qt/mainwindow.ui
+++ b/OSBindings/Qt/mainwindow.ui
@@ -644,6 +644,48 @@
         <string>MSX</string>
        </attribute>
        <layout class="QVBoxLayout">
+        <item>
+         <layout class="QHBoxLayout">
+          <item>
+           <layout class="QFormLayout">
+            <item row="0" column="0">
+             <widget class="QLabel">
+              <property name="text">
+               <string>Model</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QComboBox" name="msxModelComboBox">
+              <item>
+               <property name="text">
+                <string>MSX 1</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>MSX 2</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <spacer>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
         <item>
          <layout class="QHBoxLayout">
           <item>
@@ -698,6 +740,13 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QCheckBox" name="msxMSXMUSICCheckBox">
+          <property name="text">
+           <string>Attach MSX-MUSIC</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <spacer>
           <property name="orientation">