diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index a2c6b4e7f14773fa0b3c4ebe1e618cc40e144e13..064430b12c526b968f4f7c1b5f1336f28deb4540 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -29,16 +29,17 @@
 
 #include "debuggermanager.h"
 
-#include "debuggerplugin.h"
 #include "debuggeractions.h"
 #include "debuggeragents.h"
-#include "debuggerrunner.h"
 #include "debuggerconstants.h"
-#include "idebuggerengine.h"
+#include "debuggermainwindow.h"
+#include "debuggerplugin.h"
+#include "debuggerrunner.h"
 #include "debuggerstringutils.h"
-#include "watchutils.h"
+#include "debuggertooltip.h"
 #include "debuggeruiswitcher.h"
-#include "debuggermainwindow.h"
+#include "idebuggerengine.h"
+#include "watchutils.h"
 
 #include "breakwindow.h"
 #include "debuggeroutputwindow.h"
@@ -504,8 +505,6 @@ void DebuggerManager::init()
             d->m_outputWindow, SLOT(showOutput(int, QString)), Qt::QueuedConnection);
 
     // Tooltip
-    //QTreeView *tooltipView = qobject_cast<QTreeView *>(d->m_tooltipWindow);
-    //tooltipView->setModel(d->m_watchHandler->model(TooltipsWatch));
     qRegisterMetaType<WatchData>("WatchData");
     qRegisterMetaType<StackCookie>("StackCookie");
 
@@ -1147,6 +1146,7 @@ void DebuggerManager::cleanupViews()
     d->m_sourceFilesWindow->removeAll();
     d->m_disassemblerViewAgent.cleanup();
     d->m_actions.reverseDirectionAction->setChecked(false);
+    hideDebuggerToolTip();
 
     // FIXME: Move to plugin?
     using namespace Core;