diff --git a/src/visual/TextBox.js b/src/visual/TextBox.js
index 095de0b..b181b9e 100644
--- a/src/visual/TextBox.js
+++ b/src/visual/TextBox.js
@@ -319,6 +319,7 @@ export class TextBox extends util.mix(VisualStim).with(ColorMixin)
 
 				padding: padding_px + 'px',
 				multiline,
+				text: this._text,
 				height: multiline ? (height_px - 2 * padding_px) + 'px' : undefined,
 				width: (width_px - 2 * padding_px) + 'px'
 			},
diff --git a/src/visual/TextInput.js b/src/visual/TextInput.js
index 1826ce6..f99d08b 100644
--- a/src/visual/TextInput.js
+++ b/src/visual/TextInput.js
@@ -22,6 +22,7 @@ export class TextInput extends PIXI.Container
 				background: 'none',
 				border: 'none',
 				outline: 'none',
+				text: '',
 				transformOrigin: '0 0',
 				lineHeight: '1'
 			},
@@ -56,7 +57,7 @@ export class TextInput extends PIXI.Container
 		this._selection = [0, 0];
 		this._restrict_value = '';
 		this._createDOMInput();
-		this.substituteText = false;
+		this.substituteText = !this._multiline;
 		this._setState('DEFAULT');
 	}