diff --git a/src/diff.c b/src/diff.c
index 25b9ae977b..ec0640c56a 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -2226,6 +2226,7 @@ calculate_topfill_and_topline(
     diff_T	*thistopdiff = NULL;
     diff_T	*next_adjacent_blocks = NULL;
     int		virtual_lines_passed = 0;
+    int		curlinenum_to = 1;
 
     find_top_diff_block(&thistopdiff, &next_adjacent_blocks, fromidx, from_topline);
 
@@ -2253,7 +2254,8 @@ calculate_topfill_and_topline(
 
     // move the same amount of virtual lines in the target buffer to find the
     // cursor's line number
-    int curlinenum_to = thistopdiff->df_lnum[toidx];
+    if (thistopdiff != NULL)
+	curlinenum_to = thistopdiff->df_lnum[toidx];
 
     int virt_lines_left = virtual_lines_passed;
     curdif = thistopdiff;
diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index ff9b63ba3a..a26a1b8fd2 100644
--- a/src/testdir/test_crash.vim
+++ b/src/testdir/test_crash.vim
@@ -143,6 +143,28 @@ func Test_crash1_2()
   call s:RunCommandAndWait(buf, args ..
     \ ' ; echo "crash 5: [OK]" >> '.. result)
 
+  let file = 'Xdiff'
+  let lines =<< trim END
+    diffs a
+    edit Xdiff
+    file b
+    exe "norm! \<C-w>\<C-w>"
+    exe "norm! \<C-w>\<C-w>"
+    exe "norm! \<C-w>\<C-w>"
+    exe "norm! \<C-w>\<C-w>"
+    exe "norm! \<C-w>\<C-w>"
+    exe "norm! \<C-w>\L"
+    exe "norm! \<C-j>oy\<C-j>"
+    edit Xdiff
+    sil!so
+  END
+  call writefile(lines, file, 'D')
+  let cmn_args = "%s -u NONE -i NONE -X -m -n -e -s -u %s -c ':qa!'"
+  let args = printf(cmn_args, vim, file)
+  call s:RunCommandAndWait(buf, args ..
+    \ ' && echo "crash 6: [OK]" >> '.. result)
+
+
   " clean up
   exe buf .. "bw!"
   exe "sp " .. result
@@ -152,6 +174,7 @@ func Test_crash1_2()
       \ 'crash 3: [OK]',
       \ 'crash 4: [OK]',
       \ 'crash 5: [OK]',
+      \ 'crash 6: [OK]',
       \ ]
 
   call assert_equal(expected, getline(1, '$'))
diff --git a/src/version.c b/src/version.c
index 016f73f87e..0565a8216a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1818,
 /**/
     1817,
 /**/