diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index a643f59c..c0c1a905 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -4377,7 +4377,11 @@
 			</versionNumber>
 			<releaseDate>2023-04-27 00:00:00.000 CET</releaseDate>
 			<name></name>
-			<changes>	
+			<changes>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>When editing Label components, default focus to the text editor</description>
+				</org.diylc.appframework.update.Change>	
 				<org.diylc.appframework.update.Change>
 					<changeType>BUG_FIX</changeType>
 					<description>Unable to move selected components if one of them is close to being reduced to a point</description>
diff --git a/diylc/diylc-swing/src/org/diylc/swing/gui/editor/MultiLineStringEditor.java b/diylc/diylc-swing/src/org/diylc/swing/gui/editor/MultiLineStringEditor.java
index 4ac4ed3f..76f42956 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/gui/editor/MultiLineStringEditor.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/gui/editor/MultiLineStringEditor.java
@@ -88,5 +88,11 @@ public class MultiLineStringEditor extends JScrollPane {
     property.setChanged(true);
     getTextArea().setBackground(oldBg);
     property.setValue(getTextArea().getText());
+  }
+  
+  @Override
+  public boolean requestFocusInWindow() {
+    getTextArea().selectAll();
+    return getTextArea().requestFocusInWindow();
   }
 }