diff --git a/OSBindings/Qt/clksignal.pro b/OSBindings/Qt/clksignal.pro
index f1644ee29..15ebced2a 100644
--- a/OSBindings/Qt/clksignal.pro
+++ b/OSBindings/Qt/clksignal.pro
@@ -225,6 +225,8 @@ HEADERS += \
 	$$SRC/InstructionSets/x86/*.hpp \
 \
 	$$SRC/Machines/*.hpp \
+	$$SRC/Machines/Acorn/Archimedes/*.hpp \
+	$$SRC/Machines/Acorn/Electron/*.hpp \
 	$$SRC/Machines/Amiga/*.hpp \
 	$$SRC/Machines/AmstradCPC/*.hpp \
 	$$SRC/Machines/Apple/ADB/*.hpp \
@@ -238,7 +240,6 @@ HEADERS += \
 	$$SRC/Machines/Commodore/1540/Implementation/*.hpp \
 	$$SRC/Machines/Commodore/Plus4/*.hpp \
 	$$SRC/Machines/Commodore/Vic-20/*.hpp \
-	$$SRC/Machines/Electron/*.hpp \
 	$$SRC/Machines/Enterprise/*.hpp \
 	$$SRC/Machines/MasterSystem/*.hpp \
 	$$SRC/Machines/MSX/*.hpp \
diff --git a/OSBindings/Qt/mainwindow.cpp b/OSBindings/Qt/mainwindow.cpp
index d439c02f7..f9d4f321b 100644
--- a/OSBindings/Qt/mainwindow.cpp
+++ b/OSBindings/Qt/mainwindow.cpp
@@ -1021,6 +1021,7 @@ void MainWindow::startMachine() {
 	TEST(macintosh);
 	TEST(msx);
 	TEST(oric);
+	TEST(plus4);
 	TEST(pc);
 	TEST(spectrum);
 	TEST(vic20);
@@ -1261,8 +1262,15 @@ void MainWindow::start_spectrum() {
 	launchTarget(std::move(target));
 }
 
+void MainWindow::start_plus4() {
+	using Target = Analyser::Static::Commodore::Plus4Target;
+	auto target = std::make_unique<Target>();
+	target->has_c1540 = ui->plus4C1541CheckBox->isChecked();
+	launchTarget(std::move(target));
+}
+
 void MainWindow::start_vic20() {
-	using Target = Analyser::Static::Commodore::Target;
+	using Target = Analyser::Static::Commodore::Vic20Target;
 	auto target = std::make_unique<Target>();
 
 	switch(ui->vic20RegionComboBox->currentIndex()) {
diff --git a/OSBindings/Qt/mainwindow.h b/OSBindings/Qt/mainwindow.h
index 28f8206e7..9efe073ac 100644
--- a/OSBindings/Qt/mainwindow.h
+++ b/OSBindings/Qt/mainwindow.h
@@ -106,6 +106,7 @@ class MainWindow : public QMainWindow, public Outputs::Speaker::Speaker::Delegat
 		void start_macintosh();
 		void start_msx();
 		void start_oric();
+		void start_plus4();
 		void start_pc();
 		void start_spectrum();
 		void start_vic20();
diff --git a/OSBindings/Qt/mainwindow.ui b/OSBindings/Qt/mainwindow.ui
index 54b088bc0..2d07349d4 100644
--- a/OSBindings/Qt/mainwindow.ui
+++ b/OSBindings/Qt/mainwindow.ui
@@ -881,6 +881,33 @@
         </item>
        </layout>
       </widget>
+      <widget class="QWidget" name="plus4Tab">
+       <attribute name="title">
+        <string>Plus 4</string>
+       </attribute>
+       <layout class="QVBoxLayout">
+        <item>
+         <widget class="QCheckBox" name="plus4C1541CheckBox">
+          <property name="text">
+           <string>Attach C-1541 disk drive</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
       <widget class="QWidget" name="pcTab">
        <attribute name="title">
         <string>PC Compatible</string>