diff --git a/ora/Features/Sidebar/Views/ContainerView.swift b/ora/Features/Sidebar/Views/ContainerView.swift
index 55df9e83..2a386195 100644
--- a/ora/Features/Sidebar/Views/ContainerView.swift
+++ b/ora/Features/Sidebar/Views/ContainerView.swift
@@ -52,8 +52,8 @@ struct ContainerView: View {
             }
 
             ScrollView(.vertical, showsIndicators: false) {
-                VStack(alignment: .leading, spacing: 16) {
-                    if !privacyMode.isPrivate {
+                VStack(alignment: .leading, spacing: 8) {
+                    if !privacyMode.isPrivate, !pinnedTabs.isEmpty || draggedItem != nil {
                         PinnedTabsList(
                             tabs: pinnedTabs,
                             draggedItem: $draggedItem,
@@ -66,7 +66,7 @@ struct ContainerView: View {
                             onMoveToContainer: moveTab,
                             containers: containers
                         )
-                        Divider()
+                        if !pinnedTabs.isEmpty { Divider() }
                     }
                     NormalTabsList(
                         tabs: normalTabs,
diff --git a/ora/Features/Sidebar/Views/TabList/PinnedTabsList.swift b/ora/Features/Sidebar/Views/TabList/PinnedTabsList.swift
index 63b16ab1..69ade078 100644
--- a/ora/Features/Sidebar/Views/TabList/PinnedTabsList.swift
+++ b/ora/Features/Sidebar/Views/TabList/PinnedTabsList.swift
@@ -16,14 +16,15 @@ struct PinnedTabsList: View {
     @Environment(\.theme) var theme
 
     var body: some View {
-        VStack(spacing: 8) {
-            Text("Pinned")
-                .font(.callout)
-                .foregroundColor(theme.mutedForeground)
-                .padding(.top, 8)
-                .frame(maxWidth: .infinity, alignment: .leading)
+        VStack(spacing: 4) {
+            if !tabs.isEmpty || draggedItem != nil {
+                Text("Pinned")
+                    .font(.callout)
+                    .foregroundColor(theme.mutedForeground)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+            }
             if tabs.isEmpty {
-                EmptyPinnedTabs()
+                if draggedItem != nil { EmptyPinnedTabs() }
             } else {
                 ForEach(tabs) { tab in
                     TabItem(