diff --git a/src/vs/workbench/contrib/remote/browser/tunnelView.ts b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
index 9b0241b7a2dd3..e29b42e7db09e 100644
--- a/src/vs/workbench/contrib/remote/browser/tunnelView.ts
+++ b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
@@ -395,11 +395,11 @@ class ActionBarRenderer extends Disposable implements ITableRenderer<ActionBarCe
 
 		let editableData: IEditableData | undefined;
 		if (element.editId === TunnelEditId.New && (editableData = this.remoteExplorerService.getEditableData(undefined))) {
-			this.renderInputBox(templateData.container, editableData);
+			templateData.elementDisposable = this.renderInputBox(templateData.container, editableData);
 		} else {
 			editableData = this.remoteExplorerService.getEditableData(element.tunnel, element.editId);
 			if (editableData) {
-				this.renderInputBox(templateData.container, editableData);
+				templateData.elementDisposable = this.renderInputBox(templateData.container, editableData);
 			} else if ((element.tunnel.tunnelType === TunnelType.Add) && (element.menuId === MenuId.TunnelPortInline)) {
 				this.renderButton(element, templateData);
 			} else {
@@ -525,7 +525,7 @@ class ActionBarRenderer extends Disposable implements ITableRenderer<ActionBarCe
 			if (this.inputDone) {
 				this.inputDone = undefined;
 			}
-			inputBox.element.style.display = 'none';
+			inputBox.element.remove();
 			const inputValue = inputBox.value;
 			if (finishEditing) {
 				return editableData.onFinish(inputValue, success);