diff --git a/CHANGES.txt b/CHANGES.txt
index 88fda81..18c3f01 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+1.0.26
+
+-   Reimplement @h271fa PR #62 for original nostalgy (https://github.com/nostalgy/nostalgy/pull/62)
+    which fixed original #60 (https://github.com/nostalgy/nostalgy/issues/60). This should fix #4.
+
 1.0.25
 
 -   Use Services for restart
diff --git a/chrome/content/folders.js b/chrome/content/folders.js
index 19424dd..c435b26 100644
--- a/chrome/content/folders.js
+++ b/chrome/content/folders.js
@@ -184,7 +184,7 @@ function NostalgyGetAutoCompleteValuesFunction(box) {
      * cancelled with Escape.  We thus force the popup to be opened some time after
      * the completion is done.
      */
-    if (box.popup.state == "closed" && nb != 0)
+    if (false && box.popup.state == "closed" && nb != 0)
       setTimeout(function() {
                    if (box.popup.state == "closed") {
                      NostalgyDebug("Forcing popup to be opened");
diff --git a/chrome/content/nostalgy.js b/chrome/content/nostalgy.js
index fdc0d77..a35799e 100644
--- a/chrome/content/nostalgy.js
+++ b/chrome/content/nostalgy.js
@@ -269,7 +269,12 @@ function NostalgyHide(restore) {
  nostalgy_th_statusBar.hidden = nostalgy_th_statusBar_orig_hidden;
 
  if (nostalgy_focus_saved) {
-  if (restore) nostalgy_focus_saved.focus ();
+  if (restore) {
+    if (nostalgy_folderBox != nostalgy_focus_saved) {
+      var _nfs = nostalgy_focus_saved;
+      setTimeout(function() {_nfs.focus();}, 0);
+    }
+  }
   nostalgy_focus_saved = null;
  }
  NostalgyDefLabel();
@@ -331,6 +336,7 @@ function NostalgyShowRecentFoldersList() {
   var box = nostalgy_folderBox;
   if (box.controller) {// Toolkit
     listener = box.controller.QueryInterface(Components.interfaces.nsIAutoCompleteObserver);
+    box.controller.handleKeyNavigation(KeyEvent.DOM_VK_DOWN);
 	}
   else { // XPFE
     // box.mAutoCompleteObserver uses a flawed equality check so we have to replace it.
diff --git a/manifest.json b/manifest.json
index fe8ae33..2cf65fb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
 	"manifest_version": 2,
 	"name": "Nostalgy",
   "description": "Adds shortcuts to change folder, move/copy messages, with folder completion, and other utilities to archive or organise emails. User instructions at tools->addon settings->nostalgy->  Nostalgy usage directions",
-	"version": "1.0.25",
+	"version": "1.0.26",
 	"author": "Alain Frisch, opto (Klaus Buecher)",
 	"developer": {
 		"name": "Alain Frisch, opto (Klaus Buecher)"
@@ -22,4 +22,4 @@
 		}
 	}
 }
-                                                                                                                                                        
\ No newline at end of file
+