diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml
index 50c8d837fed47d139df1e3db45dafa79bfb6141f..45f88355315934acfac1481ec18bb28bd728c31e 100644
--- a/src/QmlControls/ParameterEditor.qml
+++ b/src/QmlControls/ParameterEditor.qml
@@ -118,6 +118,11 @@ QGCView {
                     onTriggered:	controller.clearRCToParam()
                     visible:        _showRCToParam
                 }
+                MenuSeparator { }
+                MenuItem {
+                    text:           qsTr("Reboot Vehicle")
+                    onTriggered:    showDialog(rebootVehicleConfirmComponent, qsTr("Reboot Vehicle"), qgcView.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Ok)
+                }
             }
         }
 
@@ -294,4 +299,21 @@ QGCView {
             }
         }
     }
+
+    Component {
+        id: rebootVehicleConfirmComponent
+
+        QGCViewDialog {
+            function accept() {
+                QGroundControl.multiVehicleManager.activeVehicle.rebootVehicle()
+                hideDialog()
+            }
+
+            QGCLabel {
+                width:              parent.width
+                wrapMode:           Text.WordWrap
+                text:               qsTr("Select Ok to reboot vehicle.")
+            }
+        }
+    }
 } // QGCView
diff --git a/src/QmlControls/ParameterEditorController.h b/src/QmlControls/ParameterEditorController.h
index 74e2d3e05e34a9cf999c876fd78d70a53547f2e4..2c8b275fa595a18cff0248fc77338c42ed2d99a5 100644
--- a/src/QmlControls/ParameterEditorController.h
+++ b/src/QmlControls/ParameterEditorController.h
@@ -36,20 +36,20 @@ public:
     Q_PROPERTY(QmlObjectListModel*  parameters          MEMBER _parameters          CONSTANT)
     Q_PROPERTY(QVariantList         componentIds        MEMBER _componentIds        CONSTANT)
 	
-	Q_INVOKABLE QStringList getGroupsForComponent(int componentId);
-	Q_INVOKABLE QStringList getParametersForGroup(int componentId, QString group);
+    Q_INVOKABLE QStringList getGroupsForComponent(int componentId);
+    Q_INVOKABLE QStringList getParametersForGroup(int componentId, QString group);
     Q_INVOKABLE QStringList searchParametersForComponent(int componentId, const QString& searchText, bool searchInName=true, bool searchInDescriptions=true);
 	
-	Q_INVOKABLE void clearRCToParam(void);
+    Q_INVOKABLE void clearRCToParam(void);
     Q_INVOKABLE void saveToFilePicker(void);
     Q_INVOKABLE void loadFromFilePicker(void);
     Q_INVOKABLE void saveToFile(const QString& filename);
     Q_INVOKABLE void loadFromFile(const QString& filename);
     Q_INVOKABLE void refresh(void);
     Q_INVOKABLE void resetAllToDefaults(void);
-	Q_INVOKABLE void setRCToParam(const QString& paramName);
+    Q_INVOKABLE void setRCToParam(const QString& paramName);
 	
-	QList<QObject*> model(void);
+    QList<QObject*> model(void);
     
 signals:
     void searchTextChanged(QString searchText);