diff --git a/editor/script/script_editor_base.cpp b/editor/script/script_editor_base.cpp
index ef7939d3fa9..42facc1f691 100644
--- a/editor/script/script_editor_base.cpp
+++ b/editor/script/script_editor_base.cpp
@@ -645,6 +645,9 @@ TextEditorBase::TextEditorBase() {
 
 	edit_hb = memnew(HBoxContainer);
 
+	goto_line_popup = memnew(GotoLinePopup);
+	add_child(goto_line_popup);
+
 	Ref<EditorPlainTextSyntaxHighlighter> plain_highlighter;
 	plain_highlighter.instantiate();
 	add_syntax_highlighter(plain_highlighter);
diff --git a/editor/script/script_editor_plugin.cpp b/editor/script/script_editor_plugin.cpp
index 0e7efa37b82..c8fece67c85 100644
--- a/editor/script/script_editor_plugin.cpp
+++ b/editor/script/script_editor_plugin.cpp
@@ -3395,10 +3395,9 @@ void ScriptEditor::update_docs_from_script(const Ref<Script> &p_script) {
 }
 
 void ScriptEditor::_update_selected_editor_menu() {
-	if (TextEditorBase *current_editor = Object::cast_to<TextEditorBase>(_get_current_editor())) {
-		for (Control *editor_menu : editor_menus) {
-			editor_menu->set_visible(current_editor && editor_menu == current_editor->get_edit_menu());
-		}
+	TextEditorBase *current_editor = Object::cast_to<TextEditorBase>(_get_current_editor());
+	for (Control *editor_menu : editor_menus) {
+		editor_menu->set_visible(current_editor && editor_menu == current_editor->get_edit_menu());
 	}
 
 	PopupMenu *search_popup = script_search_menu->get_popup();