4 files changed, 35 insertions, 7 deletions
diff --git a/scene/3d/path_3d.cpp b/scene/3d/path_3d.cpp
index f25a64c567..ae6bbad8bf 100644
--- a/scene/3d/path_3d.cpp
+++ b/scene/3d/path_3d.cpp
@@ -94,10 +94,6 @@ void PathFollow3D::_update_transform(bool p_update_xyz_rot) {
 		return;
 	}
 
-	if (delta_offset == 0) {
-		return;
-	}
-
 	float bl = c->get_baked_length();
 	if (bl == 0.0) {
 		return;
@@ -156,7 +152,7 @@ void PathFollow3D::_update_transform(bool p_update_xyz_rot) {
 
 		t.origin = pos;
 
-		if (p_update_xyz_rot) { // Only update rotation if some parameter has changed - i.e. not on addition to scene tree
+		if (p_update_xyz_rot && delta_offset != 0) { // Only update rotation if some parameter has changed - i.e. not on addition to scene tree.
 			Vector3 t_prev = (pos - c->interpolate_baked(offset - delta_offset, cubic)).normalized();
 			Vector3 t_cur = (c->interpolate_baked(offset + delta_offset, cubic) - pos).normalized();
 
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index bfbb3cb3f3..07f03ad40e 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -238,6 +238,7 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) {
 			search_from = 0;
 		}
 
+		bool match_found = false;
 		for (int i = search_from; i < items.size(); i++) {
 			if (!items[i].separator && !items[i].disabled) {
 				mouse_over = i;
@@ -245,15 +246,31 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) {
 				_scroll_to_item(i);
 				control->update();
 				set_input_as_handled();
+				match_found = true;
 				break;
 			}
 		}
+
+		if (!match_found) {
+			// If the last item is not selectable, try re-searching from the start.
+			for (int i = 0; i < search_from; i++) {
+				if (!items[i].separator && !items[i].disabled) {
+					mouse_over = i;
+					emit_signal("id_focused", i);
+					_scroll_to_item(i);
+					control->update();
+					set_input_as_handled();
+					break;
+				}
+			}
+		}
 	} else if (p_event->is_action("ui_up") && p_event->is_pressed()) {
 		int search_from = mouse_over - 1;
 		if (search_from < 0) {
 			search_from = items.size() - 1;
 		}
 
+		bool match_found = false;
 		for (int i = search_from; i >= 0; i--) {
 			if (!items[i].separator && !items[i].disabled) {
 				mouse_over = i;
@@ -261,9 +278,24 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) {
 				_scroll_to_item(i);
 				control->update();
 				set_input_as_handled();
+				match_found = true;
 				break;
 			}
 		}
+
+		if (!match_found) {
+			// If the first item is not selectable, try re-searching from the end.
+			for (int i = items.size() - 1; i >= search_from; i--) {
+				if (!items[i].separator && !items[i].disabled) {
+					mouse_over = i;
+					emit_signal("id_focused", i);
+					_scroll_to_item(i);
+					control->update();
+					set_input_as_handled();
+					break;
+				}
+			}
+		}
 	} else if (p_event->is_action("ui_left") && p_event->is_pressed()) {
 		Node *n = get_parent();
 		if (n && Object::cast_to<PopupMenu>(n)) {
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 6350777a3d..e496748b2d 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -3824,7 +3824,7 @@ void SubViewport::_bind_methods() {
 
 	BIND_ENUM_CONSTANT(CLEAR_MODE_ALWAYS);
 	BIND_ENUM_CONSTANT(CLEAR_MODE_NEVER);
-	BIND_ENUM_CONSTANT(CLEAR_MODE_ONLY_NEXT_FRAME);
+	BIND_ENUM_CONSTANT(CLEAR_MODE_ONCE);
 
 	BIND_ENUM_CONSTANT(UPDATE_DISABLED);
 	BIND_ENUM_CONSTANT(UPDATE_ONCE);
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
index 7ce202d27c..f08f255dde 100644
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@@ -624,7 +624,7 @@ public:
 	enum ClearMode {
 		CLEAR_MODE_ALWAYS,
 		CLEAR_MODE_NEVER,
-		CLEAR_MODE_ONLY_NEXT_FRAME
+		CLEAR_MODE_ONCE
 	};
 
 	enum UpdateMode {