diff --git a/Scribunto.php b/Scribunto.php
index a3f47155..c7d420c7 100644
--- a/Scribunto.php
+++ b/Scribunto.php
@@ -82,7 +82,7 @@ $wgResourceModules['ext.scribunto'] = $sbtpl + array(
 $wgResourceModules['ext.scribunto.edit'] = $sbtpl + array(
 	'scripts' => 'ext.scribunto.edit.js',
 	'styles' => 'ext.scribunto.edit.css',
-	'dependencies' => array( 'ext.scribunto', 'mediawiki.api' ),
+	'dependencies' => array( 'ext.scribunto', 'mediawiki.api', 'jquery.spinner' ),
 	'messages' => array(
 		'scribunto-console-title',
 		'scribunto-console-intro',
diff --git a/modules/ext.scribunto.edit.js b/modules/ext.scribunto.edit.js
index 2c28fdf2..08d36559 100644
--- a/modules/ext.scribunto.edit.js
+++ b/modules/ext.scribunto.edit.js
@@ -17,6 +17,7 @@
 		question,
 		_in,
 		_out,
+		_$spinner,
 		lastError = null,
 		sessionContent = null,
 		sessionKey = null,
@@ -31,6 +32,7 @@
 	function initConsole() {
 		_in = document.getElementById( "mw-scribunto-input" );
 		_out = document.getElementById( "mw-scribunto-output" );
+		_$spinner = $.createSpinner( { size: 'small', type: 'block' } );
 
 		recalculateInputHeight();
 		println( mw.msg( 'scribunto-console-intro' ), 'mw-scribunto-message' );
@@ -208,9 +210,11 @@
 	function setPending() {
 		pending = true;
 		_in.readOnly = true;
+		_$spinner.insertBefore( _in );
 	}
 
 	function clearPending() {
+		_$spinner.remove();
 		pending = false;
 		_in.readOnly = false;
 	}