diff --git a/app/assets/tailwind/application.css b/app/assets/tailwind/application.css
index 4af14181..c665a763 100644
--- a/app/assets/tailwind/application.css
+++ b/app/assets/tailwind/application.css
@@ -20,7 +20,6 @@
   }
   .pcr-color-palette{
       height: 12em !important;
-      width: 21.5rem !important;
   }
   .pcr-palette{
       border-radius: 10px !important;
diff --git a/app/javascript/controllers/category_controller.js b/app/javascript/controllers/category_controller.js
index fdd47729..ec0ab645 100644
--- a/app/javascript/controllers/category_controller.js
+++ b/app/javascript/controllers/category_controller.js
@@ -15,6 +15,7 @@ export default class extends Controller {
     "validationMessage",
     "selection",
     "colorPickerRadioBtn",
+    "popup",
   ];
 
   static values = {
@@ -36,6 +37,7 @@ export default class extends Controller {
         this.colorInputTarget.reportValidity();
         e.target.open = true;
       }
+      this.updatePopupPosition()
     });
 
     this.selectedIcon = null;
@@ -43,6 +45,8 @@ export default class extends Controller {
     if (!this.presetColorsValue.includes(this.colorInputTarget.value)) {
       this.colorPickerRadioBtnTarget.checked = true;
     }
+
+    document.addEventListener("mousedown", this.handleOutsideClick);
   }
 
   initPicker() {
@@ -209,6 +213,7 @@ export default class extends Controller {
     this.colorsSectionTarget.classList.add("hidden");
     this.paletteSectionTarget.classList.remove("hidden");
     this.pickerSectionTarget.classList.remove("hidden");
+    this.updatePopupPosition();
     this.picker.show();
   }
 
@@ -216,6 +221,7 @@ export default class extends Controller {
     this.colorsSectionTarget.classList.remove("hidden");
     this.paletteSectionTarget.classList.add("hidden");
     this.pickerSectionTarget.classList.add("hidden");
+    this.updatePopupPosition()
     if (this.picker) {
       this.picker.destroyAndRemove();
     }
@@ -229,6 +235,27 @@ export default class extends Controller {
     }
   }
 
+  handleOutsideClick = (event) => {
+    if (this.detailsTarget.open && !this.detailsTarget.contains(event.target)) {
+      this.detailsTarget.open = false;
+    }
+  };
+
+  updatePopupPosition() {
+    const popup = this.popupTarget;
+    popup.style.top = "";
+    popup.style.bottom = "";
+
+    const rect = popup.getBoundingClientRect();
+    const overflow = rect.bottom > window.innerHeight;
+
+    if (overflow) {
+      popup.style.bottom = "0px";
+    } else {
+      popup.style.bottom = "";
+    }
+  }
+
   #backgroundColor(color) {
     return `color-mix(in oklab, ${color} 10%, transparent)`;
   }
diff --git a/app/views/categories/_form.html.erb b/app/views/categories/_form.html.erb
index 2c62d739..b0f75b8f 100644
--- a/app/views/categories/_form.html.erb
+++ b/app/views/categories/_form.html.erb
@@ -2,20 +2,20 @@
 
 <div data-controller="category" data-category-preset-colors-value="<%= Category::COLORS %>">
   <%= styled_form_with model: category, class: "space-y-4" do |f| %>
-    <section class="space-y-4 ">
+    <section class="space-y-4">
       <div class="w-fit mx-auto relative">
         <%= render partial: "color_avatar", locals: { category: category } %>
 
-        <details data-category-target="details">
+        <details data-category-target="details" data-action="mousedown->category#handleOutsideClick">
           <summary class="cursor-pointer absolute -bottom-2 -right-2 flex justify-center items-center bg-surface-inset hover:bg-surface-inset-hover border-2 w-7 h-7 border-subdued rounded-full text-secondary">
             <%= icon("pen", size: "sm") %>
           </summary>
 
-          <div class="fixed ml-8 mt-2 z-50 bg-container p-4 border border-alpha-black-25 rounded-2xl shadow-xs h-fit">
+          <div class="fixed right-0 sm:right-auto mx-2 sm:ml-8 sm:mr-0 mt-2 z-50 bg-container p-4 border border-alpha-black-25 rounded-2xl shadow-xs h-fit" data-category-target="popup">
             <div class="flex gap-2 flex-col mb-4" data-category-target="selection" style="<%= "display:none;" if @category.subcategory? %>">
               <div data-category-target="pickerSection"></div>
               <h4 class="text-gray-500 text-sm">Color</h4>
-              <div class="flex gap-2 items-center" data-category-target="colorsSection">
+              <div class="flex flex-wrap md:flex-nowrap gap-2 items-center" data-category-target="colorsSection">
                 <% Category::COLORS.each do |color| %>
                   <label class="relative">
                     <%= f.radio_button :color, color, class: "sr-only peer", data: { action: "change->category#handleColorChange" } %>
@@ -40,7 +40,7 @@
               </div>
             </div>
 
-            <div class="flex flex-wrap gap-2 justify-center flex-col w-87">
+            <div class="flex flex-wrap gap-2 justify-center flex-col w-auto md:w-87">
               <h4 class="text-secondary text-sm">Icon</h4>
               <div class="flex flex-wrap gap-0.5">
                 <% Category.icon_codes.each do |icon| %>