diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp
index abc4a03498..af210fff1c 100644
--- a/scene/3d/camera.cpp
+++ b/scene/3d/camera.cpp
@@ -191,11 +191,12 @@ void Camera::_update_camera() {
 		get_viewport()->_camera_transform_changed_notify();
 	*/
 
-	if (is_inside_tree() && is_current()) {
-		get_viewport()->_camera_transform_changed_notify();
-	}
+	if (!is_inside_tree() || get_tree()->is_node_being_edited(this) || !is_current())
+		return;
 
-	if (is_current() && get_world().is_valid()) {
+	get_viewport()->_camera_transform_changed_notify();
+
+	if (get_world().is_valid()) {
 		get_world()->_update_camera(this);
 	}
 }
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index d864b0f763..a785abbc65 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -936,6 +936,9 @@ void Viewport::_camera_remove(Camera *p_camera) {
 
 	cameras.erase(p_camera);
 	if (camera == p_camera) {
+		if (camera && find_world().is_valid()) {
+			camera->notification(Camera::NOTIFICATION_LOST_CURRENT);
+		}
 		camera = NULL;
 	}
 }