diff --git a/src/libs/utils/proxyaction.cpp b/src/libs/utils/proxyaction.cpp
index 90e2989e34a4ff28147902b6273de52396c4eb95..f4d0607644762794a503db8356a5e9486afc1122 100644
--- a/src/libs/utils/proxyaction.cpp
+++ b/src/libs/utils/proxyaction.cpp
@@ -38,7 +38,8 @@ ProxyAction::ProxyAction(QObject *parent) :
     QAction(parent),
     m_action(0),
     m_attributes(0),
-    m_showShortcut(false)
+    m_showShortcut(false),
+    m_block(false)
 {
     connect(this, SIGNAL(changed()), this, SLOT(updateToolTipWithKeySequence()));
     updateState();
@@ -161,15 +162,14 @@ void ProxyAction::setShortcutVisibleInToolTip(bool visible)
 
 void ProxyAction::updateToolTipWithKeySequence()
 {
-    static bool block = false;
-    if (block)
+    if (m_block)
         return;
-    block = true;
+    m_block = true;
     if (!m_showShortcut || shortcut().isEmpty())
         setToolTip(m_toolTip);
     else
         setToolTip(stringWithAppendedShortcut(m_toolTip, shortcut()));
-    block = false;
+    m_block = false;
 }
 
 QString ProxyAction::stringWithAppendedShortcut(const QString &str, const QKeySequence &shortcut)
diff --git a/src/libs/utils/proxyaction.h b/src/libs/utils/proxyaction.h
index 2cd6b70accb7361a57764533eda40196734ae7b1..f06682c99a206961ab91f291ddc4bbb54ff29909 100644
--- a/src/libs/utils/proxyaction.h
+++ b/src/libs/utils/proxyaction.h
@@ -81,6 +81,7 @@ private:
     Attributes m_attributes;
     bool m_showShortcut;
     QString m_toolTip;
+    bool m_block;
 };
 
 } // namespace Utils