diff --git a/content/editor.js b/content/editor.js
index 567675cd..e7fe2dcb 100644
--- a/content/editor.js
+++ b/content/editor.js
@@ -237,7 +237,8 @@ liberator.Editor = function () //{{{
             // broken in FF3, deletes the whole line:
             // liberator.editor.executeCommand("cmd_deleteToBeginningOfLine", 1);
             liberator.editor.executeCommand("cmd_selectBeginLine", 1);
-            liberator.editor.executeCommand("cmd_delete", 1);
+            if (getController().isCommandEnabled("cmd_delete"))
+                liberator.editor.executeCommand("cmd_delete", 1);
         });
 
     liberator.mappings.add(modes,
diff --git a/content/events.js b/content/events.js
index 34c782df..79dd94d0 100644
--- a/content/events.js
+++ b/content/events.js
@@ -480,6 +480,7 @@ liberator.Events = function () //{{{
             else
                 liberator.echo("Waiting for page to load...");
         }
+        liberator.modes.show();
 
         // TODO: allow macros to be continued when page does not fully load with an option
         var ret = (liberator.buffer.loaded == 1);
@@ -1115,30 +1116,7 @@ liberator.Events = function () //{{{
                  || liberator.mode == liberator.modes.INSERT)
             {
                 if (key == "<Return>")
-                {
-                    /*if (liberator.modes.isReplaying != 44)
-                    {
-                        // TODO: how to really submit the correct form?
-                         //content.document.forms[0].submit();
-                        var elem = document.commandDispatcher.focusedElement;
-                        if (elem)
-                        {
-                            liberator.log("dipatching <enter>");
-                            event.ignore = true;
-                            try{
-                            elem.dispatchEvent(event);
-                            } catch (e) { alert(e); }
-                            event.stopPropagation();
-                            event.preventDefault();
-                            liberator.log("dipatched");
-                            waitForPageLoaded();
-                            liberator.log("page loaded");
-                            return false;
-                        }
-                    }
-                    else*/
-                        return false;
-                }
+                    return false;
                 else if (key == "<Space>" || key == "<Up>" || key == "<Down>")
                     return false;
             }