1 files changed, 11 insertions, 2 deletions
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 12d6be0d2..a31b67e12 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -82,7 +82,8 @@ DolphinView::DolphinView(QWidget* parent,
     m_dolphinModel(dolphinModel),
     m_dirLister(dirLister),
     m_proxyModel(proxyModel),
-    m_iconManager(0)
+    m_iconManager(0),
+    m_toolTipManager(0)
 {
     setFocusPolicy(Qt::StrongFocus);
     m_topLayout = new QVBoxLayout(this);
@@ -750,6 +751,9 @@ void DolphinView::triggerItem(const KFileItem& item)
         return;
     }
 
+    if (m_toolTipManager != 0) {
+        m_toolTipManager->hideTip();
+    }
     emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
 }
 
@@ -767,6 +771,10 @@ void DolphinView::openContextMenu(const QPoint& pos)
         item = fileItem(index);
     }
 
+    if (m_toolTipManager != 0) {
+        m_toolTipManager->hideTip();
+    }
+
     m_isContextMenuOpen = true; // TODO: workaround for Qt-issue xxxxxx
     emit requestContextMenu(item, url());
     m_isContextMenuOpen = false;
@@ -1086,7 +1094,7 @@ void DolphinView::createView()
     m_iconManager->setShowPreview(m_showPreview);
 
     if (DolphinSettings::instance().generalSettings()->showToolTips()) {
-        new ToolTipManager(view, m_proxyModel);
+        m_toolTipManager = new ToolTipManager(view, m_proxyModel);
     }
 
     m_topLayout->insertWidget(1, view);
@@ -1112,6 +1120,7 @@ void DolphinView::deleteView()
         m_columnView = 0;
         m_fileItemDelegate = 0;
         m_iconManager = 0;
+        m_toolTipManager = 0;
     }
 }