diff --git a/src/OneWare.Core/Services/DockService.cs b/src/OneWare.Core/Services/DockService.cs
index ef9e7769..526eca79 100644
--- a/src/OneWare.Core/Services/DockService.cs
+++ b/src/OneWare.Core/Services/DockService.cs
@@ -242,6 +242,11 @@ public void Show<T>(DockShowLocation location = DockShowLocation.Window) where T
 
     public void Show(IDockable dockable, DockShowLocation location = DockShowLocation.Window)
     {
+        if (IsDockablePinned(dockable))
+        {
+            UnpinDockable(dockable);
+        }
+        
         //Check if dockable already exists
         if (SearchView(dockable) is { } result)
         {