diff --git a/OSBindings/Qt/mainwindow.cpp b/OSBindings/Qt/mainwindow.cpp
index b498bd538..2f2ba19b3 100644
--- a/OSBindings/Qt/mainwindow.cpp
+++ b/OSBindings/Qt/mainwindow.cpp
@@ -1286,6 +1286,7 @@ void MainWindow::start_spectrum() {
 void MainWindow::start_thomson() {
 	using Target = Analyser::Static::Thomson::MOTarget;
 	auto target = std::make_unique<Target>();
+	target->floppy = ui->thomsonDiskDriveCheckBox->isChecked() ? Target::Floppy::CD90_640 : Target::Floppy::None;
 	launchTarget(std::move(target));
 }
 
@@ -1427,6 +1428,9 @@ void MainWindow::processAllSettings() {
 	applier(ui->pcSpeedComboBox, "pc.speed");
 	applier(ui->pcVideoAdaptorComboBox, "pc.videoAdaptor");
 
+	/* Thomson. */
+	applier(ui->thomsonDiskDriveCheckBox, "thomson.hasDiskDrive");
+
 	/* Vic-20 */
 	applier(ui->vic20RegionComboBox, "vic20.region");
 	applier(ui->vic20MemorySizeComboBox, "vic20.memorySize");
diff --git a/OSBindings/Qt/mainwindow.ui b/OSBindings/Qt/mainwindow.ui
index 37401ded5..92d37a87c 100644
--- a/OSBindings/Qt/mainwindow.ui
+++ b/OSBindings/Qt/mainwindow.ui
@@ -823,17 +823,24 @@
       </widget>
       <widget class="QWidget" name="thomsonTab">
        <attribute name="title">
-        <string>Thomson</string>
+        <string>Thomson MO5</string>
        </attribute>
-       <layout class="QFormLayout">
-        <item row="0" column="0">
-         <widget class="QLabel">
+       <layout class="QVBoxLayout">
+        <item>
+         <widget class="QCheckBox" name="thomsonDiskDriveCheckBox">
           <property name="text">
-           <string> At present only an unexpanded Thomson MO5 is available.</string>
+           <string>With Disk Drive</string>
           </property>
          </widget>
         </item>
-       </layout>
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Orientation::Vertical</enum>
+          </property>
+         </spacer>
+        </item>
+	</layout>
       </widget>
       <widget class="QWidget" name="vic20Tab">
        <attribute name="title">