diff --git a/Loki/InventorySlotEditor.xaml b/Loki/InventorySlotEditor.xaml
index e418606..03a699f 100644
--- a/Loki/InventorySlotEditor.xaml
+++ b/Loki/InventorySlotEditor.xaml
@@ -167,7 +167,7 @@
     </UserControl.Resources>
 
 
-    <Border CornerRadius="4" x:Name="LayoutRoot" AllowDrop="True" Drop="BorderDrop">
+    <Border CornerRadius="4" x:Name="LayoutRoot" AllowDrop="True" Drop="BorderDrop" MouseMove="BorderMouseMove">
         <Border.Style>
             <Style TargetType="Border">
                 <Setter Property="Background" Value="DarkGray"/>
diff --git a/Loki/InventorySlotEditor.xaml.cs b/Loki/InventorySlotEditor.xaml.cs
index 544c228..0e20c2a 100644
--- a/Loki/InventorySlotEditor.xaml.cs
+++ b/Loki/InventorySlotEditor.xaml.cs
@@ -22,6 +22,7 @@ private void BorderDrop(object sender, DragEventArgs e)
         {
             if (e.Data.GetData(typeof(SharedItemData)) is SharedItemData itemData)
             {
+                // drop from item picker
                 if (this.DataContext is InventorySlot slot)
                 {
                     var customData = new List<(string, string)>();
@@ -29,12 +30,40 @@ private void BorderDrop(object sender, DragEventArgs e)
                         false, 1, 0, MainWindow.selectedPlayerProfile.PlayerId, MainWindow.selectedPlayerProfile.PlayerName, customData);
                 }
             }
+            else if (e.Data.GetData(typeof(InventorySlot)) is InventorySlot sourceSlot)
+            {
+                // drop from inventory slot
+                if (this.DataContext is InventorySlot slot && sourceSlot != slot)
+                {
+                    var targetSlotItem = slot.Item;
+                    slot.Item = sourceSlot.Item;
+                    sourceSlot.Item = targetSlotItem;
+                }
+            }
+        }
+
+        private void BorderMouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.Source is TextBox)
+            {
+                // TextBox has its own Drag&Drop functionality and would raise an InvalidOperationException
+                return;
+            }
+
+            if (sender is FrameworkElement element && e.LeftButton == MouseButtonState.Pressed)
+            {
+                if (element.DataContext is InventorySlot slot && slot.Item != null)
+                {
+                    var data = new DataObject(slot);
+                    DragDrop.DoDragDrop(element, data, DragDropEffects.Move);
+                }
+            }
         }
 
         private void StackEditPreviewMouseDown(object sender, MouseButtonEventArgs e)
         {
-            if (sender is TextBox {IsKeyboardFocusWithin: false} txtStack) 
-            {  
+            if (sender is TextBox { IsKeyboardFocusWithin: false } txtStack)
+            {
                 txtStack.SelectAll();
                 txtStack.Focus();
                 e.Handled = true;