diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fca81d1..627308cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [2.0.0-beta.4]
+🛠️ Fixed 🛠️
+* `ToolBar`s in use where a `SideBar` is not present will now have their title's avoid the traffic lights (native window controls).
+
 ## [2.0.0-beta.3]
 ✨ New ✨
 * Added support for `weekdayAbbreviations` and `monthAbbreviations` to `MacosDatePicker`.
diff --git a/example/pubspec.lock b/example/pubspec.lock
index ce6e9a1a..727c8aac 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -97,7 +97,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.0.0-beta.3"
+    version: "2.0.0-beta.4"
   macos_window_utils:
     dependency: transitive
     description:
diff --git a/lib/src/layout/window.dart b/lib/src/layout/window.dart
index 3171decc..4d8b4cf5 100644
--- a/lib/src/layout/window.dart
+++ b/lib/src/layout/window.dart
@@ -226,8 +226,10 @@ class _MacosWindowState extends State<MacosWindow> {
         final height = constraints.maxHeight;
         final isAtBreakpoint = width <= (sidebar?.windowBreakpoint ?? 0);
         final isAtEndBreakpoint = width <= (endSidebar?.windowBreakpoint ?? 0);
-        final canShowSidebar = _showSidebar && !isAtBreakpoint;
-        final canShowEndSidebar = _showEndSidebar && !isAtEndBreakpoint;
+        final canShowSidebar =
+            _showSidebar && !isAtBreakpoint && sidebar != null;
+        final canShowEndSidebar =
+            _showEndSidebar && !isAtEndBreakpoint && endSidebar != null;
         final visibleSidebarWidth = canShowSidebar ? _sidebarWidth : 0.0;
         final visibleEndSidebarWidth =
             canShowEndSidebar ? _endSidebarWidth : 0.0;
diff --git a/pubspec.yaml b/pubspec.yaml
index ceb9b29b..740361b5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: macos_ui
 description: Flutter widgets and themes implementing the current macOS design language.
-version: 2.0.0-beta.3
+version: 2.0.0-beta.4
 homepage: "https://macosui.dev"
 repository: "https://github.com/GroovinChip/macos_ui"