diff --git a/ReactNativeClient/lib/services/plugins/api/JoplinCommands.ts b/ReactNativeClient/lib/services/plugins/api/JoplinCommands.ts
index af927020b7..84c98242a3 100644
--- a/ReactNativeClient/lib/services/plugins/api/JoplinCommands.ts
+++ b/ReactNativeClient/lib/services/plugins/api/JoplinCommands.ts
@@ -12,9 +12,9 @@ import { Command } from './types';
  * It is also possible to execute internal Joplin's commands which, as of now, are not well documented.
  * You can find the list directly on GitHub though at the following locations:
  *
- * https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/MainScreen/commands
- * https://github.com/laurent22/joplin/tree/dev/ElectronClient/commands
- * https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.ts
+ * * [Main screen commands](https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/MainScreen/commands)
+ * * [Global commands](https://github.com/laurent22/joplin/tree/dev/ElectronClient/commands)
+ * * [Editor commands](https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.ts)
  *
  * To view what arguments are supported, you can open any of these files and look at the `execute()` command.
  */
diff --git a/ReactNativeClient/lib/services/plugins/api/types.ts b/ReactNativeClient/lib/services/plugins/api/types.ts
index a0636920c1..a641b7f156 100644
--- a/ReactNativeClient/lib/services/plugins/api/types.ts
+++ b/ReactNativeClient/lib/services/plugins/api/types.ts
@@ -40,9 +40,7 @@ export interface Command {
 	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
 	 * And | && | "oneNoteSelected && !inConflictFolder"
 	 *
-	 * Currently the supported context variables aren't documented, but you can find the list there:
-	 *
-	 * https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/services/commands/stateToWhenClauseContext.ts
+	 * Currently the supported context variables aren't documented, but you can [find the list here](https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/services/commands/stateToWhenClauseContext.ts).
 	 *
 	 * Note: Commands are enabled by default unless you use this property.
 	 */
diff --git a/docs/api/references/plugin_api/classes/joplincommands.html b/docs/api/references/plugin_api/classes/joplincommands.html
index 52ae0b4e4a..87bb53d744 100644
--- a/docs/api/references/plugin_api/classes/joplincommands.html
+++ b/docs/api/references/plugin_api/classes/joplincommands.html
@@ -76,9 +76,11 @@
 					</a>
 					<p>It is also possible to execute internal Joplin&#39;s commands which, as of now, are not well documented.
 					You can find the list directly on GitHub though at the following locations:</p>
-					<p><a href="https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/MainScreen/commands">https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/MainScreen/commands</a>
-						<a href="https://github.com/laurent22/joplin/tree/dev/ElectronClient/commands">https://github.com/laurent22/joplin/tree/dev/ElectronClient/commands</a>
-					<a href="https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.ts">https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.ts</a></p>
+					<ul>
+						<li><a href="https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/MainScreen/commands">Main screen commands</a></li>
+						<li><a href="https://github.com/laurent22/joplin/tree/dev/ElectronClient/commands">Global commands</a></li>
+						<li><a href="https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.ts">Editor commands</a></li>
+					</ul>
 					<p>To view what arguments are supported, you can open any of these files and look at the <code>execute()</code> command.</p>
 				</div>
 			</section>
diff --git a/docs/api/references/plugin_api/interfaces/command.html b/docs/api/references/plugin_api/interfaces/command.html
index 5b0de323fa..de6173d9c5 100644
--- a/docs/api/references/plugin_api/interfaces/command.html
+++ b/docs/api/references/plugin_api/interfaces/command.html
@@ -142,8 +142,7 @@
 									<td>&quot;oneNoteSelected &amp;&amp; !inConflictFolder&quot;</td>
 								</tr>
 						</tbody></table>
-						<p>Currently the supported context variables aren&#39;t documented, but you can find the list there:</p>
-						<p><a href="https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/services/commands/stateToWhenClauseContext.ts">https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/services/commands/stateToWhenClauseContext.ts</a></p>
+						<p>Currently the supported context variables aren&#39;t documented, but you can <a href="https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/services/commands/stateToWhenClauseContext.ts">find the list here</a>.</p>
 						<p>Note: Commands are enabled by default unless you use this property.</p>
 					</div>
 				</section>