diff --git a/src/vs/workbench/parts/debug/browser/debugViewlet.ts b/src/vs/workbench/parts/debug/browser/debugViewlet.ts
index 719caa8aa4d1a4d53a2e50f3dc25992acf6edf4e..cdd88383ed63cd8cd02b1e0de9fb3b09e87eac2a 100644
--- a/src/vs/workbench/parts/debug/browser/debugViewlet.ts
+++ b/src/vs/workbench/parts/debug/browser/debugViewlet.ts
@@ -25,7 +25,6 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { ViewLocation } from 'vs/workbench/browser/parts/views/viewsRegistry';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { Constants } from 'vs/editor/common/core/uint';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 
 export class DebugViewlet extends PersistentViewsViewlet {
@@ -129,8 +128,9 @@ export class DebugViewlet extends PersistentViewsViewlet {
 	}
 
 	private updateBreakpointsMaxSize(): void {
+		// We need to update the breakpoints view since all other views are collapsed #25384
 		const allOtherCollapsed = this.views.every(view => !view.isExpanded() || view === this.breakpointView);
-		this.breakpointView.maximumBodySize = allOtherCollapsed ? Constants.MAX_SAFE_SMALL_INTEGER : this.breakpointView.minimumBodySize;
+		this.breakpointView.maximumBodySize = allOtherCollapsed ? Number.POSITIVE_INFINITY : this.breakpointView.minimumBodySize;
 	}
 }
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugViews.ts b/src/vs/workbench/parts/debug/electron-browser/debugViews.ts
index 539d79c98047a69460184ffe29a1218ec71eee08..d11c64455454368a189daca19a661cf4aa4945a6 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugViews.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugViews.ts
@@ -492,7 +492,10 @@ export class BreakpointsView extends ViewsViewletPanel {
 	}
 
 	private onBreakpointsChange(): void {
-		this.minimumBodySize = this.maximumBodySize = this.getExpandedBodySize();
+		this.minimumBodySize = this.getExpandedBodySize();
+		if (this.maximumBodySize < Number.POSITIVE_INFINITY) {
+			this.maximumBodySize = this.minimumBodySize;
+		}
 		if (this.tree) {
 			this.tree.refresh();
 		}