- Checkpoint

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/production-list-table/production-list-config-manager.component.jsx

@@ -376,7 +376,14 @@ export function ProductionListConfigManager({
           >
             {t("general.actions.save")}
           </Button>
-          <Button onClick={() => setOpen(false)}>{t("general.actions.close")}</Button>
+          <Button
+            onClick={() => {
+              setIsAddingNewProfile(false);
+              setOpen(false);
+            }}
+          >
+            {t("general.actions.close")}
+          </Button>
         </Space>
       </Form>
     </div>
@@ -384,11 +391,10 @@ export function ProductionListConfigManager({
 
   return (
     <Space>
-      <Popover open={open} content={popMenu}>
+      <Button loading={loading} onClick={() => setOpen(true)} disabled={isAddingNewProfile || !hasUnsavedChanges}>
-        <Button loading={loading} onClick={() => setOpen(true)} disabled={!isAddingNewProfile && !hasUnsavedChanges}>
         {t("production.actions.saveconfig")}
       </Button>
-      </Popover>
+      <Popover open={open} content={popMenu} placement="bottom">
         <Select
           style={{
             minWidth: "150px"
@@ -397,7 +403,7 @@ export function ProductionListConfigManager({
           placeholder={t("production.labels.selectview")}
           optionLabelProp="label"
           popupMatchSelectWidth={false}
-        value={activeView} // Ensure this only changes when appropriate
+          value={activeView}
         >
           {bodyshop.production_config
             .slice()
@@ -433,6 +439,7 @@ export function ProductionListConfigManager({
             </div>
           </Select.Option>
         </Select>
+      </Popover>
     </Space>
   );
 }