diff --git a/components/BeoSelector.tsx b/components/BeoSelector.tsx
index 2acdfbc..7454cd6 100644
--- a/components/BeoSelector.tsx
+++ b/components/BeoSelector.tsx
@@ -54,9 +54,10 @@ export default function BeoSelector({ selected, onChange }: Props) {
 
       {available.length > 0 && (
         <CustomSelect
-          placeholder="+ BEO hinzufügen"
+          placeholder="+ BEOs hinzufügen"
           options={available.map((b) => ({ value: String(b.ID), label: `${b.Kuerzel} — ${b.Name}` }))}
           onChange={add}
+          keepOpen
         />
       )}
     </div>
diff --git a/components/CustomSelect.tsx b/components/CustomSelect.tsx
index d581a66..25e8cb9 100644
--- a/components/CustomSelect.tsx
+++ b/components/CustomSelect.tsx
@@ -12,9 +12,10 @@ interface Props {
   options: SelectOption[];
   placeholder: string;
   onChange: (value: string) => void;
+  keepOpen?: boolean;
 }
 
-export default function CustomSelect({ options, placeholder, onChange }: Props) {
+export default function CustomSelect({ options, placeholder, onChange, keepOpen = false }: Props) {
   const [open, setOpen] = useState(false);
   const ref = useRef<HTMLDivElement>(null);
 
@@ -29,7 +30,7 @@ export default function CustomSelect({ options, placeholder, onChange }: Props)
   }, [open]);
 
   function select(value: string) {
-    setOpen(false);
+    if (!keepOpen) setOpen(false);
     onChange(value);
   }
 
@@ -62,6 +63,15 @@ export default function CustomSelect({ options, placeholder, onChange }: Props)
               {opt.label}
             </button>
           ))}
+          {keepOpen && (
+            <button
+              type="button"
+              onClick={() => setOpen(false)}
+              className="w-full px-4 py-3 text-base font-medium text-center bg-gray-100 hover:bg-gray-200 text-gray-700 rounded-b-lg border-t-2 border-gray-300"
+            >
+              Fertig
+            </button>
+          )}
         </div>
       )}
     </div>
diff --git a/components/ObjektSelector.tsx b/components/ObjektSelector.tsx
index 6c1dfe0..6c5e622 100644
--- a/components/ObjektSelector.tsx
+++ b/components/ObjektSelector.tsx
@@ -25,10 +25,6 @@ export default function ObjektSelector({ selected, onChange }: Props) {
   const available = all.filter((o) => !selectedNames.has(o.Name.toLowerCase()));
 
   function add(value: string) {
-    if (value === 'neu') {
-      setShowNewInput(true);
-      return;
-    }
     const obj = all.find((o) => o.ID === parseInt(value));
     if (obj && !selectedNames.has(obj.Name.toLowerCase())) {
       onChange([...selected, { ID: obj.ID, Name: obj.Name }]);
@@ -47,11 +43,6 @@ export default function ObjektSelector({ selected, onChange }: Props) {
     onChange(selected.filter((o) => o.Name !== name));
   }
 
-  const options = [
-    { value: 'neu', label: '— Neues Objekt eingeben —' },
-    ...available.map((o) => ({ value: String(o.ID), label: o.Name })),
-  ];
-
   return (
     <div className="space-y-3">
       <div className="flex flex-wrap gap-2">
@@ -73,11 +64,25 @@ export default function ObjektSelector({ selected, onChange }: Props) {
         ))}
       </div>
 
-      <CustomSelect
-        placeholder="+ Objekt hinzufügen"
-        options={options}
-        onChange={add}
-      />
+      <div className="flex gap-2">
+        {available.length > 0 && (
+          <div className="flex-1">
+            <CustomSelect
+              placeholder="+ Objekte hinzufügen"
+              options={available.map((o) => ({ value: String(o.ID), label: o.Name }))}
+              onChange={add}
+              keepOpen
+            />
+          </div>
+        )}
+        <button
+          type="button"
+          onClick={() => setShowNewInput((v) => !v)}
+          className="px-4 py-3 border-2 border-gray-400 rounded-lg bg-white text-base text-gray-700 hover:bg-gray-50 whitespace-nowrap"
+        >
+          + Neu
+        </button>
+      </div>
 
       {showNewInput && (
         <div className="flex gap-2">
@@ -88,6 +93,7 @@ export default function ObjektSelector({ selected, onChange }: Props) {
             onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); addNew(); } }}
             placeholder="Objektname eingeben"
             className="flex-1 px-3 py-3 border-2 border-gray-400 rounded-lg bg-white text-base focus:border-blue-500 focus:outline-none"
+            autoFocus
           />
           <button
             type="button"
@@ -101,7 +107,7 @@ export default function ObjektSelector({ selected, onChange }: Props) {
             onClick={() => { setShowNewInput(false); setNewName(''); }}
             className="px-4 py-3 bg-gray-200 text-gray-700 text-base rounded-lg hover:bg-gray-300"
           >
-            Abbrechen
+            ✕
           </button>
         </div>
       )}