diff --git a/plugin/table-mode.vim b/plugin/table-mode.vim
index 0d7379e..e30f3a6 100644
--- a/plugin/table-mode.vim
+++ b/plugin/table-mode.vim
@@ -51,7 +51,9 @@ function! s:TableEchoCell() "{{{1
 endfunction
 
 function! s:EnableTableSyntax() "{{{1
-  syntax match Table /^\s*|.\+|\s*$/ contains=TableBorder,TableSeparator,TableColumnAlign containedin=ALL
+  exec 'syntax match Table'
+        \ '/' . tablemode#table#StartExpr() . '\zs|.\+|\ze' . tablemode#table#EndExpr() . '/'
+        \ 'contains=TableBorder,TableSeparator,TableColumnAlign containedin=ALL'
   syntax match TableSeparator /|/ contained
   syntax match TableColumnAlign /:/ contained
   syntax match TableBorder /[\-+]\+/ contained