diff --git a/api/js/etemplate/Et2Select/SearchMixin.ts b/api/js/etemplate/Et2Select/SearchMixin.ts
index f132bb8bde..cafaa87217 100644
--- a/api/js/etemplate/Et2Select/SearchMixin.ts
+++ b/api/js/etemplate/Et2Select/SearchMixin.ts
@@ -386,7 +386,7 @@ export const Et2WithSearchMixin = <T extends Constructor<LitElement>>(superclass
 			if(this._activeControls)
 			{
 				// Already there
-				this._activeControls.remove();
+				return;
 			}
 
 			const div = document.createElement("div");
diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index c27ba4e4f0..bdcb50f5af 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -3698,6 +3698,12 @@ export class CalendarApp extends EgwApp
 									if(option.value == widget.select_options[j].value)
 									{
 										widget.select_options[j].label = option.label;
+
+										// Do not let remote options stay remote or they'll disappear
+										if(typeof widget.select_options[j].class == "string")
+										{
+											widget.select_options[j].class = widget.select_options[j].class.replace("remote", "")
+										}
 										found = true;
 										break;
 									}