diff --git a/editor/editor_feature_profile.cpp b/editor/editor_feature_profile.cpp
index b6bd352ed21..714df44e255 100644
--- a/editor/editor_feature_profile.cpp
+++ b/editor/editor_feature_profile.cpp
@@ -512,8 +512,8 @@ void EditorFeatureProfileManager::_class_list_item_selected() {
 		option->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
 		option->set_editable(0, true);
 		option->set_selectable(0, true);
-		option->set_checked(0, edited->is_class_editor_disabled(class_name));
-		option->set_text(0, TTR("Disable Editor"));
+		option->set_checked(0, !edited->is_class_editor_disabled(class_name));
+		option->set_text(0, TTR("Enable Contextual Editor"));
 		option->set_metadata(0, CLASS_OPTION_DISABLE_EDITOR);
 	}
 
@@ -600,7 +600,7 @@ void EditorFeatureProfileManager::_property_item_edited() {
 		int feature_selected = md;
 		switch (feature_selected) {
 			case CLASS_OPTION_DISABLE_EDITOR: {
-				edited->set_disable_class_editor(class_name, checked);
+				edited->set_disable_class_editor(class_name, !checked);
 				_save_and_update();
 				_update_selected_profile();
 			} break;
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 97ffd9a492c..c19b497ad55 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -1475,6 +1475,9 @@ bool EditorNode::_is_class_editor_disabled_by_feature_profile(const StringName &
 
 	while (class_name != StringName()) {
 
+		if (profile->is_class_disabled(class_name)) {
+			return true;
+		}
 		if (profile->is_class_editor_disabled(class_name)) {
 			return true;
 		}