diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp
index c1f7de93422500564435472d3104bf4a65223899..a88830335c88914a83930d0b3712bb680729448c 100644
--- a/src/plugins/qmldesigner/designersettings.cpp
+++ b/src/plugins/qmldesigner/designersettings.cpp
@@ -52,8 +52,9 @@ void DesignerSettings::fromSettings(QSettings *settings)
     snapMargin = settings->value(
             QLatin1String(QmlDesigner::Constants::QML_SNAPMARGIN_KEY), QVariant(0)).toInt();
     enableContextPane = settings->value(
-            QLatin1String(QmlDesigner::Constants::QML_CONTEXTPANE_KEY), QVariant(1)).toBool();
-
+            QLatin1String(QmlDesigner::Constants::QML_CONTEXTPANE_KEY), QVariant(1)).toBool();    
+    pinContextPane = settings->value(
+                QLatin1String(QmlDesigner::Constants::QML_CONTEXTPANEPIN_KEY), QVariant(0)).toBool();
     settings->endGroup();
     settings->endGroup();
 }
@@ -66,6 +67,7 @@ void DesignerSettings::toSettings(QSettings *settings) const
     settings->setValue(QLatin1String(QmlDesigner::Constants::QML_ITEMSPACING_KEY), itemSpacing);
     settings->setValue(QLatin1String(QmlDesigner::Constants::QML_SNAPMARGIN_KEY), snapMargin);
     settings->setValue(QLatin1String(QmlDesigner::Constants::QML_CONTEXTPANE_KEY), enableContextPane);
+    settings->setValue(QLatin1String(QmlDesigner::Constants::QML_CONTEXTPANEPIN_KEY), pinContextPane);
 
     settings->endGroup();
     settings->endGroup();
@@ -76,6 +78,6 @@ bool DesignerSettings::equals(const DesignerSettings &other) const
     return openDesignMode == other.openDesignMode
             && snapMargin == other.snapMargin
             && itemSpacing == other.itemSpacing
-            && enableContextPane == other.enableContextPane;
-
+            && enableContextPane == other.enableContextPane
+            && pinContextPane == other.pinContextPane;
 }
diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h
index 7b2fccd1c478cb2d352adaba372ac3562ddf98aa..9092901a7286b03ec457dba3b30ef312b66ac6b0 100644
--- a/src/plugins/qmldesigner/designersettings.h
+++ b/src/plugins/qmldesigner/designersettings.h
@@ -51,6 +51,7 @@ public:
     int itemSpacing;
     int snapMargin;
     bool enableContextPane;
+    bool pinContextPane;
 };
 
 inline bool operator==(const DesignerSettings &s1, const DesignerSettings &s2)
diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h
index 0765a3c9ed828312387b8a16e4da57332a5e4908..90dca941fed8b153866432aae8313f6340727e2d 100644
--- a/src/plugins/qmldesigner/qmldesignerconstants.h
+++ b/src/plugins/qmldesigner/qmldesignerconstants.h
@@ -62,6 +62,7 @@ const char * const QML_OPENDESIGNMODE_SETTINGS_KEY = "OpenDesignMode";
 const char * const QML_ITEMSPACING_KEY = "ItemSpacing";
 const char * const QML_SNAPMARGIN_KEY = "SnapMargin";
 const char * const QML_CONTEXTPANE_KEY = "ContextPaneEnabled";
+const char * const QML_CONTEXTPANEPIN_KEY = "ContextPanePinned";
 enum { QML_OPENDESIGNMODE_DEFAULT = 0 }; // 0 for text mode, 1 for design mode
 
 const char * const SETTINGS_CATEGORY_QML_ICON = ":/core/images/category_qml.png";
diff --git a/src/plugins/qmldesigner/settingspage.ui b/src/plugins/qmldesigner/settingspage.ui
index 66f276ca896fa80c91d9a686faac77b84010ea0c..880ca212d488dcb873296d17ddc97be7079e4b26 100644
--- a/src/plugins/qmldesigner/settingspage.ui
+++ b/src/plugins/qmldesigner/settingspage.ui
@@ -107,7 +107,17 @@
       <item>
        <widget class="QCheckBox" name="textEditHelperCheckBox">
         <property name="text">
-         <string>Text Quick Toolbar</string>
+         <string>Enable Quick Toolbar</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="textEditHelperCheckBoxPin">
+        <property name="toolTip">
+         <string>If enabled the toolbar will remain pinned to an absolute position.</string>
+        </property>
+        <property name="text">
+         <string>Pin Quick Toolbar</string>
         </property>
        </widget>
       </item>