diff --git a/install-all.sh b/install-all.sh
index 641423f6..e545dd38 100755
--- a/install-all.sh
+++ b/install-all.sh
@@ -77,7 +77,7 @@ install_lib_mesode()
     echo
     echo Profanity installer... installing libmesode
     echo
-    git clone git@github.com:boothj5/libmesode.git
+    git clone https://github.com/boothj5/libmesode.git
     cd libmesode
     ./bootstrap.sh
     ./configure --prefix=$1
@@ -117,7 +117,7 @@ cyg_install_lib_mesode()
     echo
     echo Profanity installer... installing libmesode
     echo
-    git clone git@github.com:boothj5/libmesode.git
+    git clone https://github.com/boothj5/libmesode.git
     cd libmesode
     ./bootstrap.sh
     ./bootstrap.sh # second call seems to fix problem on cygwin
diff --git a/src/command/commands.c b/src/command/commands.c
index 7df1477a..c34c7cc3 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -2689,12 +2689,15 @@ cmd_form(ProfWin *window, const char * const command, gchar **args)
         if (confwin->form) {
             cmd_autocomplete_remove_form_fields(confwin->form);
         }
-        wins_close_current();
+
+        int num = wins_get_num(window);
+
         ProfWin *new_current = (ProfWin*)wins_get_muc(confwin->roomjid);
         if (!new_current) {
             new_current = wins_get_console();
         }
         ui_ev_focus_win(new_current);
+        wins_close_by_num(num);
     }
 
     return TRUE;