diff --git a/client/src/components/fields/FieldOverlay.tsx b/client/src/components/fields/FieldOverlay.tsx
index b53a61c..47b5827 100644
--- a/client/src/components/fields/FieldOverlay.tsx
+++ b/client/src/components/fields/FieldOverlay.tsx
@@ -43,7 +43,7 @@ export function FieldOverlay({
     <div
       className={cn(
         'absolute z-50 rounded-md border border-input bg-background shadow-sm',
-        fitContainer ? 'inset-0' : 'left-0 top-0 min-w-full',
+        fitContainer ? 'inset-0' : 'left-0 top-0 min-w-full w-max',
         className
       )}
       style={style}
diff --git a/client/src/pages/TaskDetail.tsx b/client/src/pages/TaskDetail.tsx
index 3e36172..0e8befa 100644
--- a/client/src/pages/TaskDetail.tsx
+++ b/client/src/pages/TaskDetail.tsx
@@ -1297,6 +1297,8 @@ function FieldValueRow({
               const editorNode = renderEditor();
               const canShowInlineEditor = isGlobalEditMode && isEditable && !fieldState.immutable && !readOnly && editorNode != null;
               const isContractNumberField = field.type === 'contract-number';
+              const isDateWithProlongation = (field.type === 'date' || field.type === 'datetime') && field.autoProlongation;
+              const needsWideOverlay = isContractNumberField || isDateWithProlongation;
               return canShowInlineEditor ? (
                 <InlineField
                   readView={readViewNode}
@@ -1304,16 +1306,24 @@ function FieldValueRow({
                   isEditing={true}
                   editable={isEditable && !readOnly && !fieldState.immutable}
                   onEnterEdit={handleEnterEdit}
-                  fitOverlay={!isContractNumberField && field.type !== 'textarea' && field.type !== 'rich-text'}
+                  fitOverlay={!needsWideOverlay && field.type !== 'textarea' && field.type !== 'rich-text'}
                   overlayClassName={
-                    isContractNumberField
+                    needsWideOverlay
                       ? 'overflow-visible'
                       : field.type === 'textarea' || field.type === 'rich-text'
                         ? 'flex flex-col overflow-hidden'
                         : ''
                   }
                   overlayMaxHeight={field.type === 'textarea' || field.type === 'rich-text' ? 'min(85vh, 700px)' : undefined}
-                  overlayMinWidth={isContractNumberField ? 320 : field.type === 'textarea' || field.type === 'rich-text' ? '100%' : 180}
+                  overlayMinWidth={
+                    isContractNumberField
+                      ? 320
+                      : isDateWithProlongation
+                        ? 280
+                        : field.type === 'textarea' || field.type === 'rich-text'
+                          ? '100%'
+                          : 180
+                  }
                   overlayWidth={field.type === 'textarea' || field.type === 'rich-text' ? '100%' : undefined}
                   className={field.type === 'textarea' || field.type === 'rich-text' ? 'items-start min-h-[24px] w-full' : 'items-center min-h-[28px]'}
                 />