diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index e4d9be3329b..8f042dfbd00 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -3684,6 +3684,8 @@ static void template_keymap_item_properties(uiLayout *layout, const char *title,
 {
 	uiLayout *flow, *box, *row;
 
+	WM_operator_properties_sanitize(ptr, false);
+
 	uiItemS(layout);
 
 	if (title)
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 69da8fd591b..151c21d3cdd 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -817,25 +817,23 @@ struct EnumPropertyItem *wm_window_new_screen_itemf(
 	 * for dynamic strings in EnumPropertyItem.name to avoid this. */
 	static char active_screens[20][MAX_NAME + 12];
 
-	if (bmain) {
-		for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
-			if (screen->winid) {
-				BLI_snprintf(active_screens[count_act_screens], sizeof(*active_screens), "%s (Duplicate)",
-				             screen->id.name + 2);
-				tmp.name = active_screens[count_act_screens++];
-			}
-			else {
-				tmp.name = screen->id.name + 2;
-			}
-
-			tmp.value = value;
-			tmp.identifier = screen->id.name;
-			UI_id_icon_render(C, CTX_data_scene(C), &screen->id, true, false);
-			tmp.icon = BKE_icon_id_ensure(&screen->id);
-
-			RNA_enum_item_add(&item, &totitem, &tmp);
-			value++;
+	for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
+		if (screen->winid) {
+			BLI_snprintf(active_screens[count_act_screens], sizeof(*active_screens), "%s (Duplicate)",
+			             screen->id.name + 2);
+			tmp.name = active_screens[count_act_screens++];
 		}
+		else {
+			tmp.name = screen->id.name + 2;
+		}
+
+		tmp.value = value;
+		tmp.identifier = screen->id.name;
+		UI_id_icon_render(C, CTX_data_scene(C), &screen->id, true, false);
+		tmp.icon = BKE_icon_id_ensure(&screen->id);
+
+		RNA_enum_item_add(&item, &totitem, &tmp);
+		value++;
 	}
 
 	RNA_enum_item_end(&item, &totitem);