diff --git a/src/pages/menuPages/products/base/components/ProductEditorFormBody.vue b/src/pages/menuPages/products/base/components/ProductEditorFormBody.vue
index db1354b..09290fa 100644
--- a/src/pages/menuPages/products/base/components/ProductEditorFormBody.vue
+++ b/src/pages/menuPages/products/base/components/ProductEditorFormBody.vue
@@ -163,7 +163,7 @@
 
       <BaseCollapse title="مشخصات محصول" active-key="1" :actives="activeKey">
         <template #content>
-          <div class="grid gap-4 md:grid-cols-3">
+          <div class="grid gap-4 md:grid-cols-2 xl:grid-cols-3">
             <a-form-item name="title" :rules="inputRules()">
               <template #label>
                 <DashboardLabelWithHelp label="عنوان" :help="titleHelp" size="sm" />
@@ -245,7 +245,7 @@
 
       <BaseCollapse title="کارمزد و محدودیت‌ها" active-key="2" :actives="activeKey">
         <template #content>
-          <div class="grid gap-4 md:grid-cols-3">
+          <div class="grid gap-4 md:grid-cols-2">
             <a-form-item name="cash_fee_buy" :rules="requiredPriceRules('هزینه نقدی موقع خرید')">
               <template #label>
                 <DashboardLabelWithHelp label="هزینه نقدی خرید" :help="cashFeeBuyHelp" size="sm" />
@@ -618,6 +618,18 @@ defineExpose({
   min-height: 32px;
 }
 
+.product-editor-form :deep(.ant-form-item-control-input),
+.product-editor-form :deep(.ant-input-group),
+.product-editor-form :deep(.ant-picker) {
+  width: 100%;
+}
+
+.product-editor-form :deep(.hr-tamin-input),
+.product-editor-form :deep(.hr-tamin-input .ant-input),
+.product-editor-form :deep(.hr-tamin-input .ant-input-group) {
+  width: 100%;
+}
+
 .price-reference-select {
   width: 100%;
   min-width: 22rem;
diff --git a/src/pages/menuPages/products/base/index.vue b/src/pages/menuPages/products/base/index.vue
index 309380d..31503bf 100644
--- a/src/pages/menuPages/products/base/index.vue
+++ b/src/pages/menuPages/products/base/index.vue
@@ -4,7 +4,7 @@
     <BasicActionSheet
       v-model:visible="addUserVisible"
       :title="`${editId ? 'ویرایش' : 'افزودن'} محصول`"
-      modal-width="58rem"
+      modal-width="80vw"
       :loading="loading"
       :showButton="true"
       :showCancel="true"