diff --git a/src/citra_qt/cheat_gui.cpp b/src/citra_qt/cheat_gui.cpp
index 0e9727285..814303183 100644
--- a/src/citra_qt/cheat_gui.cpp
+++ b/src/citra_qt/cheat_gui.cpp
@@ -3,7 +3,6 @@
 #include <QDialogButtonBox>
 #include <QLineEdit>
 #include <QTableWidgetItem>
-
 #include "citra_qt/cheat_gui.h"
 #include "core/hle/kernel/process.h"
 #include "ui_cheat_gui.h"
@@ -203,4 +202,4 @@ NewCheatDialog::NewCheatDialog(QWidget* parent) : QDialog(parent) {
     mainLayout->addLayout(typePanel);
     mainLayout->addLayout(confirmationPanel);
 }
-NewCheatDialog::~NewCheatDialog() {}
\ No newline at end of file
+NewCheatDialog::~NewCheatDialog() {}
diff --git a/src/citra_qt/cheat_gui.h b/src/citra_qt/cheat_gui.h
index 158a6dafc..03cb3df8a 100644
--- a/src/citra_qt/cheat_gui.h
+++ b/src/citra_qt/cheat_gui.h
@@ -5,9 +5,7 @@
 #pragma once
 
 #include <memory>
-
 #include <QDialog>
-
 #include "core/cheat_core.h"
 
 class QComboBox;
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index a297caef4..13605a33e 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -7,6 +7,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <locale>
 #include <boost/range/algorithm/transform.hpp>
 #include "common/common_paths.h"
 #include "common/logging/log.h"
diff --git a/src/common/string_util.h b/src/common/string_util.h
index e5d6cbf24..18b7b9886 100644
--- a/src/common/string_util.h
+++ b/src/common/string_util.h
@@ -10,7 +10,6 @@
 #include <cstddef>
 #include <functional>
 #include <iomanip>
-#include <locale>
 #include <sstream>
 #include <string>
 #include <vector>
diff --git a/src/core/cheat_core.cpp b/src/core/cheat_core.cpp
index c8c2d2be8..5893b7570 100644
--- a/src/core/cheat_core.cpp
+++ b/src/core/cheat_core.cpp
@@ -260,7 +260,7 @@ void GatewayCheat::Execute() {
             if (line.address == 0)
                 line.address = offset;
             val = Memory::Read16(line.address);
-            if (static_cast<u16>(line.value) == val) {
+            if (static_cast<u16>(line.value) == (!static_cast<u16>(line.value >> 16) & val)) {
                 if (if_flag > 0)
                     if_flag--;
             } else {