diff --git a/src/eepp/ui/uicodeeditor.cpp b/src/eepp/ui/uicodeeditor.cpp
index f2476721f..5d3db43bb 100644
--- a/src/eepp/ui/uicodeeditor.cpp
+++ b/src/eepp/ui/uicodeeditor.cpp
@@ -3860,7 +3860,7 @@ void UICodeEditor::drawLineNumbers( const DocumentLineRange& lineRange, const Ve
 				primitives.setColor( mLineBreakColumnColor );
 				primitives.drawLine(
 					{ { startScroll.x, offset.y + lineHeight },
-					  { startScroll.x + mSize.getWidth(), offset.y + lineHeight } } );
+					  { startScroll.x + getViewportWidth(), offset.y + lineHeight } } );
 			}
 		}
 	}
diff --git a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
index 3cf7478ab..02c6a57b9 100644
--- a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
+++ b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
@@ -1199,14 +1199,15 @@ void LSPClientPlugin::renameSymbol( UICodeEditor* editor ) {
 								 "New name (caution: not all references may be replaced)" ) );
 	msgBox->setTitle( editor->getUISceneNode()->i18n( "rename", "Rename" ) );
 	msgBox->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
-	TextPosition pos = editor->getDocument().getSelection().start();
-	msgBox->getTextInput()->setText(
-		editor->getDocument().getWordInPosition( editor->getDocument().getSelection().start() ) );
+	auto selection = editor->getDocument().getSelection();
+	TextPosition selStart = selection.start();
+	msgBox->getTextInput()->setText( editor->getDocument().getWordInPosition(
+		selection.hasSelection() ? selection.end() : selStart ) );
 	msgBox->getTextInput()->getDocument().selectAll();
 	msgBox->showWhenReady();
-	msgBox->addEventListener( Event::OnConfirm, [this, pos, editor, msgBox]( const Event* ) {
+	msgBox->addEventListener( Event::OnConfirm, [this, selStart, editor, msgBox]( const Event* ) {
 		String newName( msgBox->getTextInput()->getText() );
-		mClientManager.renameSymbol( editor->getDocumentRef()->getURI(), pos, newName );
+		mClientManager.renameSymbol( editor->getDocumentRef()->getURI(), selStart, newName );
 		msgBox->closeWindow();
 	} );
 	msgBox->addEventListener( Event::OnClose, [this]( const Event* ) {