diff --git a/src/message.c b/src/message.c
index a242a26..aebf01b 100644
--- a/src/message.c
+++ b/src/message.c
@@ -2595,8 +2595,11 @@
 		    {
 			/* redisplay all lines */
 			screenclear();
-			for (i = 0; i < Rows - 1; ++i)
+			for (i = 0; mp != NULL && i < Rows - 1; ++i)
+			{
 			    mp = disp_sb_line(i, mp);
+			    ++msg_scrolled;
+			}
 		    }
 		    scroll = 0;
 		}
diff --git a/src/window.c b/src/window.c
index cbcdd4e..c4cd31a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3425,19 +3425,22 @@
     buf_T	*old_curbuf;
 {
     int		old_off = tp->tp_firstwin->w_winrow;
+    win_T	*next_prevwin = tp->tp_prevwin;
 
     curtab = tp;
     firstwin = tp->tp_firstwin;
     lastwin = tp->tp_lastwin;
     topframe = tp->tp_topframe;
+
+    /* We would like doing the TabEnter event first, but we don't have a
+     * valid current window yet, which may break some commands.
+     * This triggers autocommands, thus may make "tp" invalid. */
+    win_enter_ext(tp->tp_curwin, FALSE, TRUE);
+    prevwin = next_prevwin;
+
 #ifdef FEAT_AUTOCMD
     apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
-#endif
 
-    win_enter_ext(tp->tp_curwin, FALSE, TRUE);
-    prevwin = tp->tp_prevwin;
-
-#ifdef FEAT_AUTOCMD
     if (old_curbuf != curbuf)
 	apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
 #endif