diff --git a/source/Components/AvalonDock.Themes.Aero/Theme.xaml b/source/Components/AvalonDock.Themes.Aero/Theme.xaml
index b43c692b..fed8315c 100644
--- a/source/Components/AvalonDock.Themes.Aero/Theme.xaml
+++ b/source/Components/AvalonDock.Themes.Aero/Theme.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
 	************************************************************************
 	AvalonDock
 	
@@ -1059,9 +1059,23 @@
 							</MultiDataTrigger.Conditions>
 							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
 						</MultiDataTrigger>
-						<DataTrigger Binding="{Binding Path=CanClose}" Value="false">
+						<!--BD: 17.08.2020 use HideCommand if CanClose=false but CanHide=true-->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=CanClose}" Value="false" />
+								<Condition Binding="{Binding Path=CanHide}" Value="true" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="DocumentCloseButton" Property="Command" Value="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+							<Setter TargetName="DocumentCloseButton" Property="ToolTip" Value="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" />
+						</MultiDataTrigger>
+						<!--BD: 17.08.2020 hide button if both CanClose=false and CanHide=false-->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=CanClose}" Value="false" />
+								<Condition Binding="{Binding Path=CanHide}" Value="false" />
+							</MultiDataTrigger.Conditions>
 							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Collapsed" />
-						</DataTrigger>
+						</MultiDataTrigger>
 
 
 					</ControlTemplate.Triggers>
diff --git a/source/Components/AvalonDock.Themes.Expression/Theme.xaml b/source/Components/AvalonDock.Themes.Expression/Theme.xaml
index a1b9d481..64dcec6c 100644
--- a/source/Components/AvalonDock.Themes.Expression/Theme.xaml
+++ b/source/Components/AvalonDock.Themes.Expression/Theme.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
 	************************************************************************
 	AvalonDock
 	
@@ -926,9 +926,23 @@
 						<Trigger Property="IsMouseOver" Value="True">
 							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
 						</Trigger>
-						<DataTrigger Binding="{Binding Path=CanClose}" Value="false">
+						<!--BD: 17.08.2020 use HideCommand if CanClose=false but CanHide=true-->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=CanClose}" Value="false" />
+								<Condition Binding="{Binding Path=CanHide}" Value="true" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="DocumentCloseButton" Property="Command" Value="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+							<Setter TargetName="DocumentCloseButton" Property="ToolTip" Value="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" />
+						</MultiDataTrigger>
+						<!--BD: 17.08.2020 hide button if both CanClose=false and CanHide=false-->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=CanClose}" Value="false" />
+								<Condition Binding="{Binding Path=CanHide}" Value="false" />
+							</MultiDataTrigger.Conditions>
 							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Collapsed" />
-						</DataTrigger>
+						</MultiDataTrigger>
 						<Trigger SourceName="DocumentCloseButton" Property="IsMouseOver" Value="True">
 							<Setter TargetName="PART_ImgPinClose" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinClose_Light.png" />
 						</Trigger>
diff --git a/source/Components/AvalonDock.Themes.Metro/Theme.xaml b/source/Components/AvalonDock.Themes.Metro/Theme.xaml
index 824b13db..3347af52 100644
--- a/source/Components/AvalonDock.Themes.Metro/Theme.xaml
+++ b/source/Components/AvalonDock.Themes.Metro/Theme.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
 	************************************************************************
 	AvalonDock
 	
@@ -1088,9 +1088,23 @@
 							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
 							<Setter TargetName="PART_ImgPinClose" Property="Source" Value="Images/PinClose_Dark.png" />
 						</MultiDataTrigger>
-						<DataTrigger Binding="{Binding Path=CanClose}" Value="false">
+						<!--BD: 17.08.2020 use HideCommand if CanClose=false but CanHide=true-->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=CanClose}" Value="false" />
+								<Condition Binding="{Binding Path=CanHide}" Value="true" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="DocumentCloseButton" Property="Command" Value="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+							<Setter TargetName="DocumentCloseButton" Property="ToolTip" Value="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" />
+						</MultiDataTrigger>
+						<!--BD: 17.08.2020 hide button if both CanClose=false and CanHide=false-->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=CanClose}" Value="false" />
+								<Condition Binding="{Binding Path=CanHide}" Value="false" />
+							</MultiDataTrigger.Conditions>
 							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Collapsed" />
-						</DataTrigger>
+						</MultiDataTrigger>
 						<Trigger SourceName="DocumentCloseButton" Property="IsMouseOver" Value="True">
 							<Setter TargetName="PART_ImgPinClose" Property="Source" Value="Images/PinClose_Black.png" />
 						</Trigger>
diff --git a/source/Components/AvalonDock.Themes.VS2010/Theme.xaml b/source/Components/AvalonDock.Themes.VS2010/Theme.xaml
index da0ca4ba..191d3aae 100644
--- a/source/Components/AvalonDock.Themes.VS2010/Theme.xaml
+++ b/source/Components/AvalonDock.Themes.VS2010/Theme.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
 	************************************************************************
 	AvalonDock
 	
@@ -1134,9 +1134,23 @@
 							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
 							<Setter TargetName="PART_ImgPinClose" Property="Source" Value="Images/PinClose_Dark.png" />
 						</MultiDataTrigger>
-						<DataTrigger Binding="{Binding Path=CanClose}" Value="false">
+						<!--BD: 17.08.2020 use HideCommand if CanClose=false but CanHide=true-->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=CanClose}" Value="false" />
+								<Condition Binding="{Binding Path=CanHide}" Value="true" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="DocumentCloseButton" Property="Command" Value="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+							<Setter TargetName="DocumentCloseButton" Property="ToolTip" Value="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" />
+						</MultiDataTrigger>
+						<!--BD: 17.08.2020 hide button if both CanClose=false and CanHide=false-->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=CanClose}" Value="false" />
+								<Condition Binding="{Binding Path=CanHide}" Value="false" />
+							</MultiDataTrigger.Conditions>
 							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Collapsed" />
-						</DataTrigger>
+						</MultiDataTrigger>
 						<Trigger SourceName="DocumentCloseButton" Property="IsMouseOver" Value="True">
 							<Setter TargetName="PART_ImgPinClose" Property="Source" Value="Images/PinClose_Black.png" />
 						</Trigger>
diff --git a/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
index 7e96258e..07837993 100644
--- a/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
+++ b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
@@ -1425,9 +1425,23 @@
 						<DataTrigger Binding="{Binding Path=IsActive}" Value="true">
 							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
 						</DataTrigger>
-						<DataTrigger Binding="{Binding Path=CanClose}" Value="false">
+						<!--BD: 17.08.2020 use HideCommand if CanClose=false but CanHide=true-->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+							<Condition Binding="{Binding Path=CanClose}" Value="false" />
+								<Condition Binding="{Binding Path=CanHide}" Value="true" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="DocumentCloseButton" Property="Command" Value="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+							<Setter TargetName="DocumentCloseButton" Property="ToolTip" Value="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" />
+						</MultiDataTrigger>
+						<!--BD: 17.08.2020 hide button if both CanClose=false and CanHide=false-->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=CanClose}" Value="false" />
+								<Condition Binding="{Binding Path=CanHide}" Value="false" />
+							</MultiDataTrigger.Conditions>
 							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Collapsed" />
-						</DataTrigger>
+						</MultiDataTrigger>
 
 						<!--  Document Well : Tab : Button / Selected, inactive  -->
 						<MultiDataTrigger>
diff --git a/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs b/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs
index d5dfa2eb..3878e0a9 100644
--- a/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs
+++ b/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs
@@ -506,7 +506,8 @@ protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
 								checkPreviousContainer = false;
 							}
 
-							anchorableToImport.SetCanCloseInternal(true);
+							// BD: 17.08.2020 Remove that bodge and handle CanClose=false && CanHide=true in XAML
+							//anchorableToImport.SetCanCloseInternal(true);
 
 							paneModel.Children.Insert(i, anchorableToImport);
 							i++;
@@ -606,4 +607,4 @@ public override Geometry GetPreviewPath(OverlayWindow overlayWindow,
 
 		#endregion Overrides
 	}
-}
\ No newline at end of file
+}
diff --git a/source/Components/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs b/source/Components/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
index df164a40..988235e3 100644
--- a/source/Components/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
+++ b/source/Components/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
@@ -99,7 +99,8 @@ protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
 						int i = 0;
 						foreach (var anchorableToImport in layoutAnchorablePaneGroup.Descendents().OfType<LayoutAnchorable>().ToArray())
 						{
-							anchorableToImport.SetCanCloseInternal(true);
+							// BD: 18.07.2020 Remove that bodge and handle CanClose=false && CanHide=true in XAML
+							//anchorableToImport.SetCanCloseInternal(true);
 
 							paneModel.Children.Insert(i, anchorableToImport);
 							i++;
@@ -145,4 +146,4 @@ public override Geometry GetPreviewPath(OverlayWindow overlayWindow,
 
 		#endregion Overrides
 	}
-}
\ No newline at end of file
+}
diff --git a/source/Components/AvalonDock/Controls/LayoutDocumentTabItem.cs b/source/Components/AvalonDock/Controls/LayoutDocumentTabItem.cs
index 972e8882..34437e05 100644
--- a/source/Components/AvalonDock/Controls/LayoutDocumentTabItem.cs
+++ b/source/Components/AvalonDock/Controls/LayoutDocumentTabItem.cs
@@ -210,11 +210,12 @@ private void UpdateDragDetails()
 		private void StartDraggingFloatingWindowForContent()
 		{
 			ReleaseMouseCapture();
-			if (Model is LayoutAnchorable layoutAnchorable) layoutAnchorable.ResetCanCloseInternal();
+			// BD: 17.08.2020 Remove that bodge and handle CanClose=false && CanHide=true in XAML
+			//if (Model is LayoutAnchorable layoutAnchorable) layoutAnchorable.ResetCanCloseInternal();
 			var manager = Model.Root.Manager;
 			manager.StartDraggingFloatingWindowForContent(Model);
 		}
 
 		#endregion Private Methods
 	}
-}
\ No newline at end of file
+}
diff --git a/source/Components/AvalonDock/Layout/LayoutAnchorable.cs b/source/Components/AvalonDock/Layout/LayoutAnchorable.cs
index 60eef8ad..e12eae04 100644
--- a/source/Components/AvalonDock/Layout/LayoutAnchorable.cs
+++ b/source/Components/AvalonDock/Layout/LayoutAnchorable.cs
@@ -1,4 +1,4 @@
-/************************************************************************
+/************************************************************************
    AvalonDock
 
    Copyright (C) 2007-2013 Xceed Software Inc.
@@ -34,7 +34,8 @@ public class LayoutAnchorable : LayoutContent
 		private bool _canHide = true;
 		private bool _canAutoHide = true;
 		private bool _canDockAsTabbedDocument = true;
-		private bool _canCloseValueBeforeInternalSet;
+		// BD: 17.08.2020 Remove that bodge and handle CanClose=false && CanHide=true in XAML
+		//private bool _canCloseValueBeforeInternalSet;
 		private bool _canMove = true;
 
 		#endregion fields
@@ -575,16 +576,17 @@ internal void CloseAnchorable()
 			CloseInternal();
 		}
 
-		internal void SetCanCloseInternal(bool canClose)
-		{
-			_canCloseValueBeforeInternalSet = _canClose;
-			_canClose = canClose;
-		}
+		// BD: 17.08.2020 Remove that bodge and handle CanClose=false && CanHide=true in XAML
+		//internal void SetCanCloseInternal(bool canClose)
+		//{
+		//	_canCloseValueBeforeInternalSet = _canClose;
+		//	_canClose = canClose;
+		//}
 
-		internal void ResetCanCloseInternal()
-		{
-			_canClose = _canCloseValueBeforeInternalSet;
-		}
+		//internal void ResetCanCloseInternal()
+		//{
+		//	_canClose = _canCloseValueBeforeInternalSet;
+		//}
 
 		#endregion Internal Methods
 
@@ -608,4 +610,4 @@ private void UpdateParentVisibility()
 
 		#endregion Private Methods
 	}
-}
\ No newline at end of file
+}
diff --git a/source/Components/AvalonDock/Themes/generic.xaml b/source/Components/AvalonDock/Themes/generic.xaml
index 7b640fd4..b958e806 100644
--- a/source/Components/AvalonDock/Themes/generic.xaml
+++ b/source/Components/AvalonDock/Themes/generic.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
 	************************************************************************
 	AvalonDock
 	
@@ -799,9 +799,23 @@
 							</MultiDataTrigger.Conditions>
 							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
 						</MultiDataTrigger>
-						<DataTrigger Binding="{Binding Path=CanClose}" Value="false">
+						<!--BD: 17.08.2020 use HideCommand if CanClose=false but CanHide=true-->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=CanClose}" Value="false" />
+								<Condition Binding="{Binding Path=CanHide}" Value="true" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="DocumentCloseButton" Property="Command" Value="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+							<Setter TargetName="DocumentCloseButton" Property="ToolTip" Value="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" />
+						</MultiDataTrigger>
+						<!--BD: 17.08.2020 hide button if both CanClose=false and CanHide=false-->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=CanClose}" Value="false" />
+								<Condition Binding="{Binding Path=CanHide}" Value="false" />
+							</MultiDataTrigger.Conditions>
 							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Collapsed" />
-						</DataTrigger>
+						</MultiDataTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>