diff --git a/extension.json b/extension.json
index 25783db4..62ccab9b 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
 	"name": "WikiEditor",
-	"version": "0.5.2",
+	"version": "0.5.3",
 	"author": [
 		"Derk-Jan Hartman",
 		"Trevor Parscal",
diff --git a/modules/jquery.wikiEditor.toolbar.js b/modules/jquery.wikiEditor.toolbar.js
index 8392648d..9e0107fa 100644
--- a/modules/jquery.wikiEditor.toolbar.js
+++ b/modules/jquery.wikiEditor.toolbar.js
@@ -768,6 +768,8 @@
 				}
 				setTimeout( function () {
 					context.$textarea.trigger( 'wikiEditor-toolbar-doneInitialSections' );
+					// Use hook for attaching new toolbar tools to avoid race conditions
+					mw.hook( 'wikiEditor.toolbarReady' ).fire( context.$textarea );
 				} );
 			}
 		}