diff --git a/editor/css/main.css b/editor/css/main.css
index 0ed656de0e9291..f07406cea30262 100644
--- a/editor/css/main.css
+++ b/editor/css/main.css
@@ -101,10 +101,6 @@ textarea, input { outline: none; } /* osx */
 		text-transform: uppercase;
 	}
 
-	.TabbedPanel .Tabs .Tab:last-child {
-		margin-right: 22px;
-	}
-
 	.TabbedPanel .Panels {
 		position: absolute;
 		top: 40px;
diff --git a/editor/js/Sidebar.js b/editor/js/Sidebar.js
index dde6d9838461ef..384f376c99eca3 100644
--- a/editor/js/Sidebar.js
+++ b/editor/js/Sidebar.js
@@ -12,9 +12,11 @@ function Sidebar( editor ) {
 	const container = new UITabbedPanel();
 	container.setId( 'sidebar' );
 
+	const sidebarProperties = new SidebarProperties( editor );
+
 	const scene = new UISpan().add(
 		new SidebarScene( editor ),
-		new SidebarProperties( editor )
+		sidebarProperties
 	);
 	const project = new SidebarProject( editor );
 	const settings = new SidebarSettings( editor );
@@ -24,6 +26,14 @@ function Sidebar( editor ) {
 	container.addTab( 'settings', strings.getKey( 'sidebar/settings' ), settings );
 	container.select( 'scene' );
 
+	const sidebarPropertiesResizeObserver = new ResizeObserver( function () {
+
+		sidebarProperties.tabsDiv.setWidth( getComputedStyle( container.dom ).width );
+
+	} );
+
+	sidebarPropertiesResizeObserver.observe( container.tabsDiv.dom );
+
 	return container;
 
 }