diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
index 70bfbd22275a9fdbc892ea150ec5cdf29b717334..4f234d3b8ef185b3d31451dc9efe592df0d93b0c 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
@@ -62,8 +62,9 @@ QToolButton {
     actions:  [
     QAction {
         text: qsTr("Reset")
+        visible: backendValue.isInSubState || backendValue.isInModel
         onTriggered: {
-            backendValue.resetValue();
+            backendValue.resetValue();            
         }
 
     },
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
index e228fecf998866a36a22583a6c70bc9d681cc69e..6c70d8a1ec53b767b0a5ccf02dbae9c80d048124 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
@@ -375,7 +375,7 @@ QMenu {
      background-color: #494949;
      border: 1px solid black;
      margin: 0px;
-     color: #cacaca;
+     color: #dadada;
  }
 
  QMenu::item {
@@ -390,6 +390,10 @@ QMenu {
      border-radius: 4px;
      padding: 2px 25px 2px 20px;
  }
+ 
+  QMenu::item:disabled {    
+    color: #aaaaaa;
+ }
 QMenu::separator {
      height: 1px;
      background: #404040;