diff --git a/testclient/mainwindow.h b/testclient/mainwindow.h
--- a/testclient/mainwindow.h
+++ b/testclient/mainwindow.h
@@ -176,6 +176,12 @@
      */
     void toggleDockTitles();
 
+    /**
+     * @brief Toggle disable state of dangerous docks
+     * Command, Sd Card, Movement, Temperature Controls and Printing docks
+     * @param disabled: True if items are disabled.
+     */
+    void setDangeriousDocksDisabled(bool disabled);
     /**
      * @brief Show the about dialog
      */
diff --git a/testclient/mainwindow.cpp b/testclient/mainwindow.cpp
--- a/testclient/mainwindow.cpp
+++ b/testclient/mainwindow.cpp
@@ -60,6 +60,7 @@
 
     addLog(tr("Attempting to locate Serial Ports"));
     core->setSerialTimerInterval(1000);
+    setDangeriousDocksDisabled(true);
     populateCBs();
 
     //Icon for actionQuit
@@ -494,20 +495,12 @@
 
     case AtCore::DISCONNECTED:
         stateString = QStringLiteral("Not Connected");
-        ui->commandDock->setDisabled(true);
-        ui->moveDock->setDisabled(true);
-        ui->tempControlsDock->setDisabled(true);
-        ui->printDock->setDisabled(true);
-        ui->sdDock->setDisabled(true);
+        setDangeriousDocksDisabled(true);
         break;
 
     case AtCore::CONNECTING:
         stateString = QStringLiteral("Connecting");
-        ui->commandDock->setDisabled(false);
-        ui->moveDock->setDisabled(false);
-        ui->tempControlsDock->setDisabled(false);
-        ui->printDock->setDisabled(false);
-        ui->sdDock->setDisabled(false);
+        setDangeriousDocksDisabled(false);
         break;
 
     case AtCore::STOP:
@@ -578,6 +571,15 @@
     }
 }
 
+void MainWindow::setDangeriousDocksDisabled(bool disabled)
+{
+    ui->commandDock->widget()->setDisabled(disabled);
+    ui->moveDock->widget()->setDisabled(disabled);
+    ui->tempControlsDock->widget()->setDisabled(disabled);
+    ui->printDock->widget()->setDisabled(disabled);
+    ui->sdDock->widget()->setDisabled(disabled);
+}
+
 void MainWindow::about()
 {
     About *aboutDialog = new About(this);
diff --git a/testclient/mainwindow.ui b/testclient/mainwindow.ui
--- a/testclient/mainwindow.ui
+++ b/testclient/mainwindow.ui
@@ -197,9 +197,6 @@
     </layout>
    </widget>
    <widget class="QDockWidget" name="printDock">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
     <property name="geometry">
      <rect>
       <x>10</x>
@@ -354,9 +351,6 @@
     </widget>
    </widget>
    <widget class="QDockWidget" name="commandDock">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
     <property name="geometry">
      <rect>
       <x>0</x>
@@ -416,9 +410,6 @@
     </widget>
    </widget>
    <widget class="QDockWidget" name="sdDock">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
     <property name="geometry">
      <rect>
       <x>0</x>
@@ -722,9 +713,6 @@
    </property>
   </widget>
   <widget class="QDockWidget" name="moveDock">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
    <property name="minimumSize">
     <size>
      <width>0</width>
@@ -855,9 +843,6 @@
    </widget>
   </widget>
   <widget class="QDockWidget" name="tempControlsDock">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
    <property name="minimumSize">
     <size>
      <width>0</width>