diff --git a/src/common/CompletionModel.cpp b/src/common/CompletionModel.cpp
index 5f9dfff08..7d9251bca 100644
--- a/src/common/CompletionModel.cpp
+++ b/src/common/CompletionModel.cpp
@@ -10,6 +10,7 @@
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/Emotes.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QtAlgorithms>
 #include <utility>
@@ -78,17 +79,28 @@ int CompletionModel::rowCount(const QModelIndex &) const
 
 void CompletionModel::refresh(const QString &prefix)
 {
+    std::function<void(const QString &, TaggedString::Type)> addString;
+    if (getSettings()->prefixOnlyEmoteCompletion)
+    {
+        addString = [&](const QString &str, TaggedString::Type type) {
+            if (str.startsWith(prefix, Qt::CaseInsensitive))
+                this->items_.emplace(str + " ", type);
+        };
+    }
+    else
+    {
+        addString = [&](const QString &str, TaggedString::Type type) {
+            if (str.contains(prefix, Qt::CaseInsensitive))
+                this->items_.emplace(str + " ", type);
+        };
+    }
+
     std::lock_guard<std::mutex> guard(this->itemsMutex_);
     this->items_.clear();
 
     if (prefix.length() < 2)
         return;
 
-    auto addString = [&](const QString &str, TaggedString::Type type) {
-        if (str.startsWith(prefix, Qt::CaseInsensitive))
-            this->items_.emplace(str + " ", type);
-    };
-
     if (auto channel = dynamic_cast<TwitchChannel *>(&this->channel_))
     {
         // account emotes
diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 7dae93278..e771ee904 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -99,6 +99,7 @@ public:
         "/behaviour/autocompletion/onlyFetchChattersForSmallerStreamers", true};
     IntSetting smallStreamerLimit = {
         "/behaviour/autocompletion/smallStreamerLimit", 1000};
+    BoolSetting prefixOnlyEmoteCompletion = {"/behaviour/autocompletion/prefixOnlyCompletion", true};
 
     BoolSetting pauseChatOnHover = {"/behaviour/pauseChatHover", false};
     BoolSetting autorun = {"/behaviour/autorun", false};
diff --git a/src/widgets/helper/ResizingTextEdit.cpp b/src/widgets/helper/ResizingTextEdit.cpp
index 2df772d03..92b5b8efb 100644
--- a/src/widgets/helper/ResizingTextEdit.cpp
+++ b/src/widgets/helper/ResizingTextEdit.cpp
@@ -1,6 +1,7 @@
 #include "widgets/helper/ResizingTextEdit.hpp"
 #include "common/Common.hpp"
 #include "common/CompletionModel.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 
@@ -198,6 +199,16 @@ void ResizingTextEdit::setCompleter(QCompleter *c)
     this->completer_->setWidget(this);
     this->completer_->setCompletionMode(QCompleter::InlineCompletion);
     this->completer_->setCaseSensitivity(Qt::CaseInsensitive);
+
+    if (getSettings()->prefixOnlyEmoteCompletion)
+    {
+        this->completer_->setFilterMode(Qt::MatchStartsWith);
+    }
+    else
+    {
+        this->completer_->setFilterMode(Qt::MatchContains);
+    }
+
     QObject::connect(completer_,
                      static_cast<void (QCompleter::*)(const QString &)>(
                          &QCompleter::highlighted),
diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
index 7b5f5e48a..aec81113c 100644
--- a/src/widgets/settingspages/GeneralPage.cpp
+++ b/src/widgets/settingspages/GeneralPage.cpp
@@ -283,6 +283,8 @@ void GeneralPage::initLayout(SettingsLayout &layout)
         {"Don't show", "Always show", "Hold shift"}, s.emotesTooltipPreview,
         [](int index) { return index; }, [](auto args) { return args.index; },
         false);
+    layout.addCheckbox("Only search for emote autocompletion at the start of emote names",
+                       s.prefixOnlyEmoteCompletion);
 
     layout.addSpacing(16);
     layout.addSeperator();