diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index f55f49086e42e45aa4cf106ef7b2abec18ece145..9c97e8b59fdee9f8ff252f06a0a322858ad0b781 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -401,8 +401,8 @@ class FrameCommand(gdb.Command):
         if len(args) > 2:
             watchers = base64.b16decode(args[2], True)
         if len(watchers) > 0:
-            for watcher in watchers.split("$$"):
-                (exp, name) = watcher.split("$")
+            for watcher in watchers.split("##"):
+                (exp, name) = watcher.split("#")
                 self.handleWatch(d, exp, name)
         d.pushOutput()
         watchers = d.safeoutput
@@ -465,7 +465,7 @@ class FrameCommand(gdb.Command):
         else:
             try:
                 value = parseAndEvaluate(exp)
-                item = Item(value, "watch", None, None)
+                item = Item(value, "watch.%s" % name, None, None)
                 d.putItemHelper(item)
             except RuntimeError:
                 d.put(',value="<invalid>",')
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 205f143b67609ae0147f0fa7c6b64ba044fe243b..3a7b8e6e5a78567e243d8d393e335f9154d2550d 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3626,11 +3626,11 @@ void GdbEngine::updateLocals(const QVariant &cookie)
         while (it.hasNext()) {
             it.next();
             if (!watchers.isEmpty())
-                watchers += "$$";
+                watchers += "##";
             if (it.key() == WatchHandler::watcherEditPlaceHolder().toLatin1())
-                watchers += "<Edit>$" + QByteArray::number(it.value());
+                watchers += "<Edit>#" + QByteArray::number(it.value());
             else
-                watchers += it.key() + '$' + QByteArray::number(it.value());
+                watchers += it.key() + '#' + QByteArray::number(it.value());
         }
 
         QByteArray options;