diff --git a/src/interface/desktop/chat.html b/src/interface/desktop/chat.html
index 5078904b..786fbfdf 100644
--- a/src/interface/desktop/chat.html
+++ b/src/interface/desktop/chat.html
@@ -576,6 +576,16 @@
             }
         }
 
+        function fillCommandInPrompt(command) {
+            let chatTooltip = document.getElementById("chat-tooltip");
+            chatTooltip.style.display = "none";
+
+            let chatInput = document.getElementById("chat-input");
+            chatInput.value = "/" + command + " ";
+            chatInput.classList.add("option-enabled");
+            chatInput.focus();
+        }
+
         function onChatInput() {
             let chatInput = document.getElementById("chat-input");
             chatInput.value = chatInput.value.trimStart();
@@ -591,7 +601,7 @@
                 const command = chatInput.value.split(" ")[0].substring(1);
                 for (let key in chatOptions) {
                     if (!!!command || key.startsWith(command)) {
-                        helpText += "<b>/" + key + "</b>: " + chatOptions[key] + "<br>";
+                        helpText += `<div class="helpoption" onclick="fillCommandInPrompt('${key}')"><b>/${key}</b>: ${chatOptions[key]}</div>`;
                     }
                 }
                 chatTooltip.innerHTML = helpText;
@@ -1853,6 +1863,9 @@
             text-align: left;
             font-size: medium;
         }
+        div#chat-tooltip:hover {
+            cursor: pointer;
+        }
 
         svg.new-convo-button {
             width: 20px;