diff --git a/ground/openpilotgcs/src/plugins/config/airframe.ui b/ground/openpilotgcs/src/plugins/config/airframe.ui
index 9609b357a..e08ab3014 100644
--- a/ground/openpilotgcs/src/plugins/config/airframe.ui
+++ b/ground/openpilotgcs/src/plugins/config/airframe.ui
@@ -87,6 +87,29 @@
      </item>
      <item>
       <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Minimum</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="vehicleSetupWizardButton">
+       <property name="text">
+        <string>Vehicle Setup Wizard...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_3">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -389,8 +412,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>838</width>
-               <height>445</height>
+               <width>293</width>
+               <height>300</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_18">
@@ -925,6 +948,24 @@ p, li { white-space: pre-wrap; }
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>nameEdit</tabstop>
+  <tabstop>vehicleSetupWizardButton</tabstop>
+  <tabstop>airframesScrollArea</tabstop>
+  <tabstop>scrollArea_2</tabstop>
+  <tabstop>decelTime</tabstop>
+  <tabstop>accelTime</tabstop>
+  <tabstop>feedForwardSlider</tabstop>
+  <tabstop>maxAccelSlider</tabstop>
+  <tabstop>ffTestBox1</tabstop>
+  <tabstop>ffTestBox2</tabstop>
+  <tabstop>ffTestBox3</tabstop>
+  <tabstop>textBrowser</tabstop>
+  <tabstop>airframeHelp</tabstop>
+  <tabstop>saveAircraftToRAM</tabstop>
+  <tabstop>saveAircraftToSD</tabstop>
+  <tabstop>tabWidget</tabstop>
+ </tabstops>
  <resources>
   <include location="../coreplugin/core.qrc"/>
  </resources>
diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetfactory.h b/ground/openpilotgcs/src/plugins/config/configgadgetfactory.h
index 936cb41b4..afee59722 100644
--- a/ground/openpilotgcs/src/plugins/config/configgadgetfactory.h
+++ b/ground/openpilotgcs/src/plugins/config/configgadgetfactory.h
@@ -46,6 +46,9 @@ public:
 
     IUAVGadget *createGadget(QWidget *parent);
 
+signals:
+    void onOpenVehicleConfigurationWizard();
+
 public slots:
     void startInputWizard();
 
diff --git a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
index 3925431eb..a27d84d88 100644
--- a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
@@ -27,6 +27,7 @@
 #include "configvehicletypewidget.h"
 #include "systemsettings.h"
 #include "actuatorsettings.h"
+#include "configgadgetfactory.h"
 
 #include "cfg_vehicletypes/configccpmwidget.h"
 #include "cfg_vehicletypes/configfixedwingwidget.h"
@@ -121,6 +122,9 @@ ConfigVehicleTypeWidget::ConfigVehicleTypeWidget(QWidget *parent) : ConfigTaskWi
         m_aircraft->saveAircraftToRAM->setVisible(false);
     }
 
+    ConfigGadgetFactory *configGadgetFactory = pm->getObject<ConfigGadgetFactory>();
+    connect(m_aircraft->vehicleSetupWizardButton, SIGNAL(clicked()), configGadgetFactory, SIGNAL(onOpenVehicleConfigurationWizard()));
+
     SystemSettings *syssettings = SystemSettings::GetInstance(getObjectManager());
     Q_ASSERT(syssettings);
     m_aircraft->nameEdit->setMaxLength(syssettings->VEHICLENAME_NUMELEM);
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.cpp b/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.cpp
index 39b3d5f0e..f6c5505b1 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.cpp
@@ -29,6 +29,7 @@
 #include <QDebug>
 #include <QtPlugin>
 #include <QStringList>
+#include <configgadgetfactory.h>
 #include <extensionsystem/pluginmanager.h>
 
 #include <coreplugin/coreconstants.h>
@@ -78,6 +79,10 @@ bool SetupWizardPlugin::initialize(const QStringList & args, QString *errMsg)
     ac->appendGroup("Wizard");
     ac->addAction(cmd, "Wizard");
 
+    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
+    ConfigGadgetFactory *configGadgetFactory = pm->getObject<ConfigGadgetFactory>();
+    connect(configGadgetFactory, SIGNAL(onOpenVehicleConfigurationWizard()), this, SLOT(showSetupWizard()));
+
     return true;
 }
 
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h b/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
index 0c68e600b..580140f4b 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
+++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
@@ -33,7 +33,7 @@
 
 class SetupWizardPlugin : public ExtensionSystem::IPlugin {
     Q_OBJECT
-                                                  Q_PLUGIN_METADATA(IID "OpenPilot.SetupWizard")
+    Q_PLUGIN_METADATA(IID "OpenPilot.SetupWizard")
 
 public:
     SetupWizardPlugin();