diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml
index f8cef429002e1a4037c524913ebfb833ebe8aaac..ab925eeffc2b8631bc42a9e9b1ebd3956c55981c 100644
--- a/src/QmlControls/ParameterEditor.qml
+++ b/src/QmlControls/ParameterEditor.qml
@@ -25,7 +25,7 @@
 ///     @author Don Gagne <don@thegagnes.com>
 
 import QtQuick 2.3
-import QtQuick.Controls 1.2
+import QtQuick.Controls 1.3
 import QtQuick.Controls.Styles 1.2
 
 import QGroundControl.Controls 1.0
@@ -161,6 +161,23 @@ Rectangle {
                                                     text:   modelFact.valueString + " " + modelFact.units
                                                     width:  __charWidth.contentWidth * 20
                                                     height: contentHeight
+													color:	modelFact.valueEqualsDefault ? __qgcPal.text : "orange"
+
+                                                    Menu {
+                                                        id:         rightClickMenu
+                                                        visible:    false
+
+                                                        MenuItem {
+                                                            id:             resetToDefaultMenuItem
+                                                            text:           "Reset to default"
+                                                            enabled:        modelFact.defaultValueAvailable
+                                                            onTriggered:    modelFact.value = modelFact.defaultValue
+                                                        }
+                                                        MenuItem {
+                                                            text:           "Set RC to Param"
+                                                            onTriggered: 	__controller.setRCToParam(modelData)
+                                                        }
+                                                    }
 
                                                     MouseArea {
                                                         anchors.fill:		parent
@@ -171,7 +188,7 @@ Rectangle {
 																editor.checked = true
 																editor.focus = true
 															} else if (mouse.button == Qt.RightButton) {
-																__controller.setRCToParam(modelData)
+                                                                rightClickMenu.popup()
 															}
                                                         }
                                                     }
diff --git a/src/VehicleSetup/SetupParameterEditor.qml b/src/VehicleSetup/SetupParameterEditor.qml
index 4e9e3d4fc92c6952fa07b85b0fbfeb60e9b255ae..b56eca05c73356ad272905ca765b4bd6e3787856 100644
--- a/src/VehicleSetup/SetupParameterEditor.qml
+++ b/src/VehicleSetup/SetupParameterEditor.qml
@@ -56,7 +56,7 @@ Rectangle {
 			id: infoLabel
 			width:      parent.width
 			wrapMode:   Text.WordWrap
-			text:       "Click a parameter value to modify. Right-click to set an RC to Param mapping. Use caution when modifying parameters here since the values are not checked for validity."
+			text:       "Click a parameter value to modify. Right-click for additional options. Values which have been modified from the default are shown in orange. Use caution when modifying parameters here since the values are not checked for validity."
 		}
 
 		ParameterEditor {