diff --git a/packages/app-desktop/gui/MainScreen/commands/index.ts b/packages/app-desktop/gui/MainScreen/commands/index.ts
index a16f51aad..589648b6d 100644
--- a/packages/app-desktop/gui/MainScreen/commands/index.ts
+++ b/packages/app-desktop/gui/MainScreen/commands/index.ts
@@ -17,6 +17,7 @@ import * as renameFolder from './renameFolder';
 import * as renameTag from './renameTag';
 import * as search from './search';
 import * as setTags from './setTags';
+import * as showModalMessage from './showModalMessage';
 import * as showNoteContentProperties from './showNoteContentProperties';
 import * as showNoteProperties from './showNoteProperties';
 import * as showPrompt from './showPrompt';
@@ -48,6 +49,7 @@ const index: any[] = [
 	renameTag,
 	search,
 	setTags,
+	showModalMessage,
 	showNoteContentProperties,
 	showNoteProperties,
 	showPrompt,
diff --git a/packages/tools/gulp/tasks/buildCommandIndex.js b/packages/tools/gulp/tasks/buildCommandIndex.js
index 703302d2f..9801f02a1 100644
--- a/packages/tools/gulp/tasks/buildCommandIndex.js
+++ b/packages/tools/gulp/tasks/buildCommandIndex.js
@@ -4,7 +4,7 @@ const rootDir = utils.rootDir();
 const pathUtils = require('@joplin/lib/path-utils');
 
 async function processDirectory(dir) {
-	const tsFiles = glob.sync('*.ts', {
+	const tsFiles = glob.sync('{**/*.ts,**/*.tsx}', {
 		cwd: dir,
 	}).filter(f => f !== 'index.ts');