diff --git a/Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp b/Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp
index 3d786fa098..db30d7e156 100644
--- a/Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp
+++ b/Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp
@@ -234,12 +234,13 @@ bool CheatCodeEditor::AcceptGecko()
 
     QStringList values = line.split(QStringLiteral(" "));
 
-    bool good = true;
+    bool good = values.size() == 2;
 
     u32 addr = 0;
     u32 value = 0;
 
-    addr = values[0].toUInt(&good, 16);
+    if (good)
+      addr = values[0].toUInt(&good, 16);
 
     if (good)
       value = values[1].toUInt(&good, 16);
@@ -272,7 +273,7 @@ bool CheatCodeEditor::AcceptGecko()
   {
     QMessageBox::critical(this, tr("Error"),
                           tr("The resulting decrypted AR code doesn't contain any lines."));
-    return true;
+    return false;
   }
 
   m_gecko_code->name = m_name_edit->text().toStdString();
diff --git a/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp b/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp
index 4b65e46b4b..607c1c9099 100644
--- a/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp
+++ b/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp
@@ -115,6 +115,7 @@ void GeckoCodeWidget::ConnectWidgets()
   connect(m_code_list, &QListWidget::itemChanged, this, &GeckoCodeWidget::OnItemChanged);
 
   connect(m_add_code, &QPushButton::pressed, this, &GeckoCodeWidget::AddCode);
+  connect(m_remove_code, &QPushButton::pressed, this, &GeckoCodeWidget::RemoveCode);
   connect(m_edit_code, &QPushButton::pressed, this, &GeckoCodeWidget::EditCode);
   connect(m_download_codes, &QPushButton::pressed, this, &GeckoCodeWidget::DownloadCodes);