diff --git a/src/text_editor/buffer.cpp b/src/text_editor/buffer.cpp
index cbd5436..5297f69 100644
--- a/src/text_editor/buffer.cpp
+++ b/src/text_editor/buffer.cpp
@@ -307,7 +307,7 @@ API Int GetWordEnd(Buffer *buffer, Int pos) {
 }
 
 API bool IsLoadWord(char16_t w) {
-    bool result = w == u'(' || w == u')' || w == u'/' || w == u'\\' || w == u':' || w == u'$' || w == u'_' || w == u'.' || w == u'@' || w == u',';
+    bool result = w == u'(' || w == u')' || w == u'/' || w == u'\\' || w == u':' || w == u'$' || w == u'_' || w == u'.' || w == u'!' || w == u'@' || w == u',';
     if (!result) {
         result = !(IsSymbol(w) || IsWhitespace(w));
     }
diff --git a/src/text_editor/commands.cpp b/src/text_editor/commands.cpp
index 69a8aae..a9acf5a 100644
--- a/src/text_editor/commands.cpp
+++ b/src/text_editor/commands.cpp
@@ -581,10 +581,10 @@ BSet Open(Window *window, String path, String meta, bool set_active = true) {
             NextActiveWindowID = set.window->id;
         }
         JumpTempBuffer(&set);
-        Exec(set.view->id, true, o.path, GetMainDir());
+        Exec(set.view->id, false, o.path, GetMainDir());
     } else if (o.kind == OpenKind_BackgroundExec) {
         // this shouldn't change the focus/window/view
-        Exec(NullViewID, true, o.path, GetMainDir());
+        Exec(NullViewID, false, o.path, GetMainDir());
     } else if (o.kind == OpenKind_Command) {
         EvalCommand(o.path);
     } else if (o.kind == OpenKind_Skip) {
@@ -883,12 +883,14 @@ void Command_Prev() {
     BSet main = GetBSet(LastActiveLayoutWindowID);
     main.window->skip_checkpoint = true;
     JumpBack(main.window);
+    NextActiveWindowID = main.window->id;
 } RegisterCommand(Command_Prev, "alt-q | mousex1");
 
 void Command_Next() {
     BSet main = GetBSet(LastActiveLayoutWindowID);
     main.window->skip_checkpoint = true;
     JumpForward(main.window);
+    NextActiveWindowID = main.window->id;
 } RegisterCommand(Command_Next, "alt-shift-q | mousex2");
 
 void Command_OpenUpFolder() {