1 files changed, 10 insertions, 1 deletions
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp
index 3b074e64f..de3713482 100644
--- a/src/gui/widgets/tabs/chat/chattab.cpp
+++ b/src/gui/widgets/tabs/chat/chattab.cpp
@@ -384,10 +384,19 @@ void ChatTab::chatInput(const std::string &message)
             handleCommandStr(std::string(msg, 1));
             break;
         case '?':
-            if (msg.size() > 1)
+            if (msg.size() > 1 &&
+                msg[1] != '!' &&
+                msg[1] != '?' &&
+                msg[1] != '.' &&
+                msg[1] != ' ' &&
+                msg[1] != ',')
+            {
                 handleHelp(std::string(msg, 1));
+            }
             else
+            {
                 handleInput(msg);
+            }
             break;
         default:
             handleInput(msg);