diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp
index 32717607165a98bb083e6144d9d5b6a43371dff2..ce88fe08a0586e1d0e0c28204e3397b9af9fd6d8 100644
--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -905,6 +905,7 @@ DebuggerToolTipTreeView::DebuggerToolTipTreeView(QWidget *parent) :
     QTreeView(parent)
 {
     setHeaderHidden(true);
+    setEditTriggers(NoEditTriggers);
 
     setUniformRowHeights(true);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 79264f95d40f25cb44f490bff427ae8c457e8105..720a2232c3eb14d60fb62402c9d400c23743bd67 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -954,7 +954,7 @@ Qt::ItemFlags WatchModel::flags(const QModelIndex &idx) const
             if (idx.column() == 1 && data.valueEditable)
                 return editable; // Watcher values are sometimes editable.
         }
-    } else {
+    } else if (data.isLocal()) {
         if (idx.column() == 1 && data.valueEditable)
             return editable; // Locals values are sometimes editable.
     }