diff --git a/vim/.vimrc b/vim/.vimrc
index 6eaaa25..4d11fe3 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -37,6 +37,16 @@ set hlsearch
 set gdefault
 
 set number
+
+" Always show the signcolumn, otherwise it would shift the text each time
+" diagnostics appear/become resolved.
+if has("patch-8.1.1564")
+  " Recently vim can merge signcolumn and number column into one
+  set signcolumn=number
+else
+  set signcolumn=yes
+endif
+
 set report=0
 
 set showcmd