diff --git a/toolboxes/paneltoolbox/contents/ui/main.qml b/toolboxes/paneltoolbox/contents/ui/main.qml
index 0168c7a5c..3a0d4cb8a 100644
--- a/toolboxes/paneltoolbox/contents/ui/main.qml
+++ b/toolboxes/paneltoolbox/contents/ui/main.qml
@@ -1,86 +1,87 @@
 /*
  *   Copyright 2011 Sebastian Kügler <sebas@kde.org>
  *   Copyright 2013 Marco Martin <mart@kde.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2 or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU Library General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.plasmoid 2.0
 
 Item {
     id: main
 
     width: isVertical ? units.iconSizes.medium : units.iconSizes.smallMedium + units.smallSpacing * 2
     height: isVertical ? units.iconSizes.smallMedium + units.smallSpacing * 2 : units.iconSizes.medium
     property bool isVertical: plasmoid.formFactor == 3
     opacity: plasmoid.immutable ? 0 : (mouseArea.containsMouse || plasmoid.userConfiguring ? 1 : 0.5)
 
     z: 999
 
     Behavior on opacity {
         NumberAnimation {
             duration: units.longDuration;
             easing.type: Easing.InOutExpo;
         }
     }
 
     LayoutMirroring.enabled: (Qt.application.layoutDirection === Qt.RightToLeft)
     anchors {
         left: undefined
         top: undefined
         right: isVertical || !parent ? undefined : parent.right
         bottom: isVertical && parent ? parent.bottom : undefined
         verticalCenter: isVertical || !parent ? undefined : parent.verticalCenter
         horizontalCenter: isVertical && parent ? parent.horizontalCenter : undefined
     }
 
     PlasmaCore.SvgItem {
         id: toolBoxIcon
         svg: PlasmaCore.Svg {
             id: iconSvg
             imagePath: "widgets/configuration-icons"
         }
         elementId: "configure"
 
         anchors.centerIn: mouseArea
         width: units.iconSizes.small
         height: width
     }
 
     Connections {
         target: plasmoid
         onUserConfiguringChanged: plasmoid.editMode = plasmoid.userConfiguring
     }
 
     MouseArea {
         id: mouseArea
         anchors.fill: parent
         hoverEnabled: enabled
         enabled: !plasmoid.immutable
         onClicked: {
             main.Plasmoid.action("configure").trigger()
         }
-    }
 
-    PlasmaCore.ToolTipArea {
-        anchors.fill: parent
-        mainText: i18nd("plasma_toolbox_org.kde.paneltoolbox", "Configure Panel")
-        icon: "configure"
+        PlasmaCore.ToolTipArea {
+            anchors.fill: parent
+            mainText: i18nd("plasma_toolbox_org.kde.paneltoolbox", "Configure Panel...")
+            icon: "configure"
+            enabled: mouseArea.containsMouse
+        }
     }
 }