3 files changed, 14 insertions, 1 deletions
diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index b86cd7269..af6246809 100644
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -64,6 +64,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
     m_dolphinModel(0),
     m_proxyModel(0),
     m_previewGenerator(0),
+    m_toolTipManager(0),
     m_dropRect()
 {
     setMouseTracking(true);
@@ -140,7 +141,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
     m_previewGenerator->setPreviewShown(m_view->m_controller->dolphinView()->showPreview());
 
     if (DolphinSettings::instance().generalSettings()->showToolTips()) {
-        new ToolTipManager(this, m_proxyModel);
+        m_toolTipManager = new ToolTipManager(this, m_proxyModel);
     }
 
     m_dirLister->openUrl(url, KDirLister::NoFlags);
@@ -390,6 +391,9 @@ void DolphinColumnWidget::keyPressEvent(QKeyEvent* event)
     QListView::keyPressEvent(event);
     requestActivation();
     m_view->m_controller->handleKeyPressEvent(event);
+    if (m_toolTipManager != 0) {
+        m_toolTipManager->hideTip();
+    }
 }
 
 void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event)
diff --git a/src/dolphincolumnwidget.h b/src/dolphincolumnwidget.h
index c1bf6a836..38649ca9d 100644
--- a/src/dolphincolumnwidget.h
+++ b/src/dolphincolumnwidget.h
@@ -39,6 +39,7 @@ class KJob;
 class KFileItem;
 class KFileItemList;
 class SelectionManager;
+class ToolTipManager;
 class QPixmap;
 
 /**
@@ -163,6 +164,8 @@ private:
 
     KFilePreviewGenerator* m_previewGenerator;
 
+    ToolTipManager* m_toolTipManager;
+
     QRect m_dropRect;
 
     friend class DolphinColumnView;
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 6681fe189..ae120777a 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -863,6 +863,12 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
         }
         break;
 
+    case QEvent::KeyPress:
+        if ((watched == itemView()) && (m_toolTipManager != 0)) {
+            m_toolTipManager->hideTip();
+        }
+        break;
+
     default:
         break;
     }