diff --git a/docs/notework.txt b/docs/notework.txt
index 1332697..d9389e6 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -10,6 +10,8 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
+- Fixed address lookup from header editor (pressing ENTER on empty To:).
+
 - Fixed keystacking conflicts:
     - KeybClear will not affect keystacking.
     - Auto Macro will not work if keystacking is used.
diff --git a/golded3/genode.cpp b/golded3/genode.cpp
index 633b1fa..fcb3b35 100644
--- a/golded3/genode.cpp
+++ b/golded3/genode.cpp
@@ -1015,7 +1015,7 @@ void Lookup(GMsg* msg, Addr* addr, char* name, int topline, char* status) {
             found = false;
           NLP->pop_state();
       }
-      else if (!found && matchaddr.point)
+      else if (!found && matchaddr.point && (topline < 0))
       {
         matchaddr.point = 0;
         NLP->find(matchaddr);