diff --git a/src/vs/workbench/parts/debug/browser/baseDebugView.ts b/src/vs/workbench/parts/debug/browser/baseDebugView.ts
index 6230949044e29b5c4c24f92d13df852cc630b7fb..74949f48d0e67ffaa1417c879c057728d53a526d 100644
--- a/src/vs/workbench/parts/debug/browser/baseDebugView.ts
+++ b/src/vs/workbench/parts/debug/browser/baseDebugView.ts
@@ -190,6 +190,11 @@ export abstract class AbstractExpressionsRenderer
 			data.toDispose.push(dom.addDisposableListener(inputBox.inputElement, 'blur', () => {
 				wrapUp(true);
 			}));
+			data.toDispose.push(dom.addDisposableListener(inputBox.inputElement, 'click', e => {
+				// Do not expand / collapse selected elements
+				e.preventDefault();
+				e.stopPropagation();
+			}));
 		};
 
 		return data;
diff --git a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
index 0512fa8bb90e630515b7f29d72661f8f4eb5d5ac..769472f0bb33daa88a4144af210c297565a6b4f3 100644
--- a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
@@ -118,7 +118,7 @@ export class WatchExpressionsView extends ViewletPanel {
 
 		const element = e.element;
 		// double click on primitive value: open input box to be able to select and copy value.
-		if (element instanceof Expression) {
+		if (element instanceof Expression && element !== this.debugService.getViewModel().getSelectedExpression()) {
 			this.debugService.getViewModel().setSelectedExpression(element);
 		} else if (!element) {
 			// Double click in watch panel triggers to add a new watch expression