diff --git a/Auto-Image.js b/Auto-Image.js
index 64546fa..ff5b525 100644
--- a/Auto-Image.js
+++ b/Auto-Image.js
@@ -1239,6 +1239,8 @@
         color: ${theme.text};
         animation: slideIn 0.4s ease-out;
         overflow: hidden;
+        display: flex;
+        flex-direction: column;
         ${theme.backdropFilter ? `backdrop-filter: ${theme.backdropFilter};` : ""}
         transition: all 0.3s ease;
         user-select: none;
@@ -1293,6 +1295,12 @@
         transform: scale(1.02);
         z-index: 9999;
       }
+      #wplace-stats-container.wplace-dragging {
+        transition: none !important;
+      }
+      #wplace-settings-container.wplace-dragging {
+        transition: none !important;
+      }
       #wplace-image-bot-container.wplace-minimized {
         width: 200px;
         height: auto;
@@ -1391,6 +1399,8 @@
         display: block;
         position: relative;
         z-index: 2;
+        overflow-y: auto;
+        flex-grow: 1;
       }
       .wplace-content.wplace-hidden {
         display: none;
@@ -2739,8 +2749,7 @@
       }
     }
 
-    // Make stats container draggable
-    makeDraggable(statsContainer)
+    
 
     // Make main container draggable
     makeDraggable(container)
@@ -2755,6 +2764,10 @@
           statsBtn.title = "Show Stats"
         } else {
           statsContainer.style.display = "block"
+          if (!statsContainer.dataset.draggable) {
+            makeDraggable(statsContainer)
+            statsContainer.dataset.draggable = "true"
+          }
           statsBtn.innerHTML = '<i class="fas fa-chart-line"></i>'
           statsBtn.title = "Hide Stats"
         }