diff --git a/components/BeoSelector.tsx b/components/BeoSelector.tsx
index b405c2e..2acdfbc 100644
--- a/components/BeoSelector.tsx
+++ b/components/BeoSelector.tsx
@@ -2,6 +2,7 @@
 
 import { useEffect, useState } from 'react';
 import type { BeoOption } from '@/types/logbuch';
+import CustomSelect from './CustomSelect';
 
 interface Props {
   selected: BeoOption[];
@@ -21,9 +22,8 @@ export default function BeoSelector({ selected, onChange }: Props) {
   const selectedIds = new Set(selected.map((b) => b.ID));
   const available = all.filter((b) => !selectedIds.has(b.ID));
 
-  function add(id: string) {
-    if (!id) return;
-    const beo = all.find((b) => b.ID === parseInt(id));
+  function add(value: string) {
+    const beo = all.find((b) => b.ID === parseInt(value));
     if (beo) onChange([...selected, beo]);
   }
 
@@ -32,18 +32,18 @@ export default function BeoSelector({ selected, onChange }: Props) {
   }
 
   return (
-    <div className="space-y-2">
+    <div className="space-y-3">
       <div className="flex flex-wrap gap-2">
         {selected.map((b) => (
           <span
             key={b.ID}
-            className="inline-flex items-center gap-1 bg-blue-100 text-blue-800 text-sm px-2 py-1 rounded-full"
+            className="inline-flex items-center gap-2 bg-blue-100 text-blue-800 text-base px-3 py-2 rounded-full"
           >
             {b.Kuerzel} — {b.Name}
             <button
               type="button"
               onClick={() => remove(b.ID)}
-              className="ml-1 text-blue-600 hover:text-red-600 font-bold leading-none"
+              className="flex items-center justify-center w-7 h-7 rounded-full text-blue-600 hover:bg-red-100 hover:text-red-600 font-bold text-xl leading-none"
               aria-label={`${b.Kuerzel} entfernen`}
             >
               ×
@@ -51,19 +51,13 @@ export default function BeoSelector({ selected, onChange }: Props) {
           </span>
         ))}
       </div>
+
       {available.length > 0 && (
-        <select
-          className="px-3 py-1.5 border-2 border-gray-400 rounded-lg bg-white text-sm focus:border-blue-500 focus:outline-none"
-          value=""
-          onChange={(e) => add(e.target.value)}
-        >
-          <option value="">+ BEO hinzufügen</option>
-          {available.map((b) => (
-            <option key={b.ID} value={b.ID}>
-              {b.Kuerzel} — {b.Name}
-            </option>
-          ))}
-        </select>
+        <CustomSelect
+          placeholder="+ BEO hinzufügen"
+          options={available.map((b) => ({ value: String(b.ID), label: `${b.Kuerzel} — ${b.Name}` }))}
+          onChange={add}
+        />
       )}
     </div>
   );
diff --git a/components/CustomSelect.tsx b/components/CustomSelect.tsx
new file mode 100644
index 0000000..d581a66
--- /dev/null
+++ b/components/CustomSelect.tsx
@@ -0,0 +1,69 @@
+'use client';
+
+import { useEffect, useRef, useState } from 'react';
+
+export interface SelectOption {
+  value: string;
+  label: string;
+  disabled?: boolean;
+}
+
+interface Props {
+  options: SelectOption[];
+  placeholder: string;
+  onChange: (value: string) => void;
+}
+
+export default function CustomSelect({ options, placeholder, onChange }: Props) {
+  const [open, setOpen] = useState(false);
+  const ref = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    function handleOutside(e: MouseEvent) {
+      if (ref.current && !ref.current.contains(e.target as Node)) {
+        setOpen(false);
+      }
+    }
+    if (open) document.addEventListener('mousedown', handleOutside);
+    return () => document.removeEventListener('mousedown', handleOutside);
+  }, [open]);
+
+  function select(value: string) {
+    setOpen(false);
+    onChange(value);
+  }
+
+  return (
+    <div ref={ref} className="relative">
+      <button
+        type="button"
+        onClick={() => setOpen((v) => !v)}
+        className="w-full flex items-center justify-between px-4 py-3 border-2 border-gray-400 rounded-lg bg-white text-base text-gray-700 focus:border-blue-500 focus:outline-none"
+      >
+        <span>{placeholder}</span>
+        <svg
+          className={`w-5 h-5 text-gray-500 transition-transform ${open ? 'rotate-180' : ''}`}
+          fill="none" viewBox="0 0 24 24" stroke="currentColor"
+        >
+          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
+        </svg>
+      </button>
+
+      {open && (
+        <div className="absolute z-50 left-0 right-0 mt-1 bg-white border-2 border-gray-400 rounded-lg shadow-lg max-h-72 overflow-y-auto">
+          {options.map((opt) => (
+            <button
+              key={opt.value}
+              type="button"
+              disabled={opt.disabled}
+              onClick={() => select(opt.value)}
+              className="w-full text-left px-4 py-3 text-base hover:bg-blue-50 active:bg-blue-100 border-b border-gray-100 last:border-0 disabled:text-gray-400 disabled:bg-gray-50"
+            >
+              {opt.label}
+            </button>
+          ))}
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/components/ObjektSelector.tsx b/components/ObjektSelector.tsx
index 85cd236..6c1dfe0 100644
--- a/components/ObjektSelector.tsx
+++ b/components/ObjektSelector.tsx
@@ -2,6 +2,7 @@
 
 import { useEffect, useState } from 'react';
 import type { ObjektOption, SelectedObjekt } from '@/types/logbuch';
+import CustomSelect from './CustomSelect';
 
 interface Props {
   selected: SelectedObjekt[];
@@ -46,19 +47,24 @@ 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-2">
+    <div className="space-y-3">
       <div className="flex flex-wrap gap-2">
         {selected.map((o) => (
           <span
             key={o.Name}
-            className="inline-flex items-center gap-1 bg-green-100 text-green-800 text-sm px-2 py-1 rounded-full"
+            className="inline-flex items-center gap-2 bg-green-100 text-green-800 text-base px-3 py-2 rounded-full"
           >
             {o.Name}
             <button
               type="button"
               onClick={() => remove(o.Name)}
-              className="ml-1 text-green-600 hover:text-red-600 font-bold leading-none"
+              className="flex items-center justify-center w-7 h-7 rounded-full text-green-600 hover:bg-red-100 hover:text-red-600 font-bold text-xl leading-none"
               aria-label={`${o.Name} entfernen`}
             >
               ×
@@ -67,19 +73,11 @@ export default function ObjektSelector({ selected, onChange }: Props) {
         ))}
       </div>
 
-      <select
-        className="px-3 py-1.5 border-2 border-gray-400 rounded-lg bg-white text-sm focus:border-blue-500 focus:outline-none"
-        value=""
-        onChange={(e) => add(e.target.value)}
-      >
-        <option value="">+ Objekt hinzufügen</option>
-        <option value="neu">— Neues Objekt eingeben —</option>
-        {available.map((o) => (
-          <option key={o.ID} value={o.ID}>
-            {o.Name}
-          </option>
-        ))}
-      </select>
+      <CustomSelect
+        placeholder="+ Objekt hinzufügen"
+        options={options}
+        onChange={add}
+      />
 
       {showNewInput && (
         <div className="flex gap-2">
@@ -89,19 +87,19 @@ export default function ObjektSelector({ selected, onChange }: Props) {
             onChange={(e) => setNewName(e.target.value)}
             onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); addNew(); } }}
             placeholder="Objektname eingeben"
-            className="flex-1 px-3 py-1.5 border-2 border-gray-400 rounded-lg bg-white text-sm focus:border-blue-500 focus:outline-none"
+            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"
           />
           <button
             type="button"
             onClick={addNew}
-            className="px-3 py-1.5 bg-green-600 text-white text-sm rounded-lg hover:bg-green-700"
+            className="px-4 py-3 bg-green-600 text-white text-base rounded-lg hover:bg-green-700"
           >
             OK
           </button>
           <button
             type="button"
             onClick={() => { setShowNewInput(false); setNewName(''); }}
-            className="px-3 py-1.5 bg-gray-200 text-gray-700 text-sm rounded-lg hover:bg-gray-300"
+            className="px-4 py-3 bg-gray-200 text-gray-700 text-base rounded-lg hover:bg-gray-300"
           >
             Abbrechen
           </button>