diff --git a/src/ui/JoystickWidget.cc b/src/ui/JoystickWidget.cc
index 73e8d2478183b380d94feb19aaf8d243227ac71e..9e4493be97f3d198babe0dd4ec1a4cedb82b9904 100644
--- a/src/ui/JoystickWidget.cc
+++ b/src/ui/JoystickWidget.cc
@@ -59,9 +59,12 @@ void JoystickWidget::initUI()
             m_ui->joystickFrame->setEnabled(true);
         }
     }
+    // But if there're no joysticks, just disable everything.
     else
     {
+        m_ui->enableCheckBox->setEnabled(false);
         m_ui->joystickNameComboBox->addItem(tr("No joysticks found. Connect and restart QGC to add one."));
+        m_ui->joystickNameComboBox->setEnabled(false);
     }
 
     // Add any missing buttons