diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf
index 73c5a999..14cd3139 100644
--- a/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf
+++ b/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf
@@ -159,6 +159,22 @@ namespace Beefy.theme.dark
                         ((DarkTabbedView)mTabbedView).DrawDockPreview(g, this);
                 }
             }            
+
+			public override void DragEnd()
+			{
+				if (mIsRightTab == true)
+				{
+					mTextColor = Color.White;
+
+					DarkTabbedView darkTabbedView = mTabbedView as DarkTabbedView;
+					darkTabbedView.SetRightTab(null, false);
+					darkTabbedView.AddTab(this, darkTabbedView.GetInsertPositionFromCursor());
+
+					Activate();
+				}
+
+				base.DragEnd();
+			}
         }
 
         public class DarkTabDock : ICustomDock
diff --git a/BeefLibs/Beefy2D/src/widgets/TabbedView.bf b/BeefLibs/Beefy2D/src/widgets/TabbedView.bf
index 77bcc848..3be0f8c0 100644
--- a/BeefLibs/Beefy2D/src/widgets/TabbedView.bf
+++ b/BeefLibs/Beefy2D/src/widgets/TabbedView.bf
@@ -143,7 +143,7 @@ namespace Beefy.widgets
                 }            
             }
 
-            public void DragStart()            
+            public virtual void DragStart()            
             {                
                 mSrcDraggingWindow = mWidgetWindow;
 
@@ -157,7 +157,7 @@ namespace Beefy.widgets
                 }                
             }
 
-            public void DragEnd()
+            public virtual void DragEnd()
             {
                 //mWidgetWindow.mMouseLeftWindowDelegate.Remove(scope => MouseLeftWindow, true);
 				AdjustPinnedState();