diff --git a/src/main.c b/src/main.c
index 2f2beff8f..9d988df63 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2273,6 +2273,8 @@ int main(int argc, char *argv[])
 						svf_description[0] = 0;
 						gravityMode = 0;
 						airMode = 0;
+						svf_last = NULL;
+						svf_lsize = 0;
 					}
 					if (x>=(XRES+BARSIZE-(510-385)) && x<=(XRES+BARSIZE-(510-476)))
 					{
@@ -2323,7 +2325,10 @@ int main(int argc, char *argv[])
 					}
 					if (x>=19 && x<=35 && svf_last && !bq) {
 						//int tpval = sys_pause;
-						parse_save(svf_last, svf_lsize, 1, 0, 0, bmap, vx, vy, pv, fvx, fvy, signs, parts, pmap);
+						if (b == 1 || !strncmp(svf_id,"",8))
+							parse_save(svf_last, svf_lsize, 1, 0, 0, bmap, vx, vy, pv, fvx, fvy, signs, parts, pmap);
+						else
+							open_ui(vid_buf, svf_id, NULL);
 						//sys_pause = tpval;
 					}
 					if (x>=(XRES+BARSIZE-(510-476)) && x<=(XRES+BARSIZE-(510-491)) && !bq)