diff --git a/components/ObjektSelector.tsx b/components/ObjektSelector.tsx
index 616c11c..4eaf393 100644
--- a/components/ObjektSelector.tsx
+++ b/components/ObjektSelector.tsx
@@ -13,6 +13,7 @@ export default function ObjektSelector({ selected, onChange }: Props) {
   const [search, setSearch] = useState('');
   const [dropdownOpen, setDropdownOpen] = useState(false);
   const wrapperRef = useRef<HTMLDivElement>(null);
+  const inputRef = useRef<HTMLInputElement>(null);
 
   useEffect(() => {
     fetch('/api/objekte')
@@ -45,7 +46,7 @@ export default function ObjektSelector({ selected, onChange }: Props) {
   function add(obj: ObjektOption) {
     onChange([...selected, { ID: obj.ID, Name: obj.Name }]);
     setSearch('');
-    setDropdownOpen(false);
+    inputRef.current?.focus();
   }
 
   function addNew(name: string) {
@@ -58,7 +59,7 @@ export default function ObjektSelector({ selected, onChange }: Props) {
       onChange([...selected, { ID: null, Name: trimmed }]);
     }
     setSearch('');
-    setDropdownOpen(false);
+    inputRef.current?.focus();
   }
 
   function remove(name: string) {
@@ -98,6 +99,7 @@ export default function ObjektSelector({ selected, onChange }: Props) {
 
       <div ref={wrapperRef} className="relative">
         <input
+          ref={inputRef}
           type="text"
           value={search}
           onChange={(e) => { setSearch(e.target.value); setDropdownOpen(true); }}
@@ -124,7 +126,7 @@ export default function ObjektSelector({ selected, onChange }: Props) {
                 onClick={() => addNew(searchTrimmed)}
                 className="w-full text-left px-4 py-2 text-sm text-blue-700 hover:bg-blue-50 active:bg-blue-100 border-t border-gray-200 font-medium"
               >
-                + „{searchTrimmed}" hinzufügen
+                + &bdquo;{searchTrimmed}&ldquo; hinzufügen
               </button>
             )}
           </div>