diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp
index d06472e3ce1..7b6eb4093bb 100644
--- a/editor/editor_data.cpp
+++ b/editor/editor_data.cpp
@@ -1028,8 +1028,8 @@ String EditorData::script_class_get_icon_path(const String &p_class, bool *r_val
 			return String();
 		}
 		HashMap<StringName, String>::ConstIterator E = _script_class_icon_paths.find(current);
-		if ((bool)E && !E->value.is_empty()) {
-			if (r_valid) {
+		if ((bool)E) {
+			if (r_valid && !E->value.is_empty()) {
 				*r_valid = true;
 			}
 			return E->value;