diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 6581180f1254afe13425c0d01aca1624eca6875a..2ac270f60f986328d476d2e31c2211f56f911ca6 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -322,8 +322,8 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
 		};
 
 		// Setup height change listener on next tick
-		const timeout = setTimeout(startListeningContentHeightChange, 0);
-		disposables.add({ dispose: () => clearTimeout(timeout) });
+		const timeout = disposableTimeout(startListeningContentHeightChange, 0);
+		disposables.add(timeout);
 
 		// Layout the editor whenever the outer layout happens
 		const layoutEditor = () => templateData.inputWidget.layout();