diff --git a/js/ui/drawing-tools.js b/js/ui/drawing-tools.js
index c37fa47..d15d7c9 100644
--- a/js/ui/drawing-tools.js
+++ b/js/ui/drawing-tools.js
@@ -1206,6 +1206,7 @@ export class DrawingManager {
         let startX, startY, initialX, initialY;
 
         header.addEventListener('mousedown', (e) => {
+            if (e.target.closest('button')) return; // Allow clicking the close button
             isDragging = true;
             startX = e.clientX;
             startY = e.clientY;
@@ -1329,6 +1330,10 @@ export class DrawingManager {
             this.applySettings('text', e.target.value);
         });
         
+        document.getElementById('tlTextInput').addEventListener('keydown', (e) => {
+            e.stopPropagation();
+        });
+        
         document.getElementById('tlAlignVert').addEventListener('change', (e) => {
             this.applySettings('alignVert', e.target.value);
         });
@@ -1400,7 +1405,6 @@ export class DrawingManager {
         if (isLineWithText) {
             if (textColorBtn && textPicker) {
                 textColorBtn.style.backgroundColor = settings.textColor || settings.color;
-                textPicker.classList.remove('hidden');
             }
             fontInput.value = settings.fontSize || 14;
             textInput.value = settings.text || '';