diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25c3193f..a2a0561d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 * Protect for spaces when searching game libraries (#496)
 * Store thread state in savestates, and check for state match when loading (#503)
 * Fix hitting "New" in RAM search not doing anything the first time
+* Prevent using "Search" before "New" in RAM search (#504)
 
 ## [1.4.3] - 2022-03-27
 ### Added
diff --git a/src/program/ui/RamSearchWindow.cpp b/src/program/ui/RamSearchWindow.cpp
index 94c8ff1e..e00ef35f 100644
--- a/src/program/ui/RamSearchWindow.cpp
+++ b/src/program/ui/RamSearchWindow.cpp
@@ -144,6 +144,7 @@ RamSearchWindow::RamSearchWindow(Context* c, QWidget *parent) : QDialog(parent),
 
     searchButton = new QPushButton(tr("Search"));
     connect(searchButton, &QAbstractButton::clicked, this, &RamSearchWindow::slotSearch);
+    searchButton->setDisabled(true);
 
     QPushButton *addButton = new QPushButton(tr("Add Watch"));
     connect(addButton, &QAbstractButton::clicked, this, &RamSearchWindow::slotAdd);
@@ -232,6 +233,7 @@ void RamSearchWindow::slotNew()
         formatGroupBox->setDisabled(false);
         ramSearchModel->clear();
         watchCount->setText("");
+        searchButton->setDisabled(true);
         return;
     }
 
@@ -322,6 +324,7 @@ void RamSearchWindow::slotSearch()
         newButton->setText(tr("New"));
         memGroupBox->setDisabled(false);
         formatGroupBox->setDisabled(false);
+        searchButton->setDisabled(true);
     }
     
     newButton->setDisabled(false);