diff --git a/lib/diff.tcl b/lib/diff.tcl
index 4cae10a..e8861ee 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -6,7 +6,7 @@ proc apply_tab_size {{firsttab {}}} {
 
 	set w [font measure font_diff "0"]
 	if {$have_tk85 && $firsttab != 0} {
-		$ui_diff configure -tabs [list [expr {$firsttab * $w}] [expr {($firsttab + $repo_config(gui.tabsize)) * $w}]]
+		$ui_diff configure -tabs [list [expr {($firsttab + $repo_config(gui.tabsize)) * $w}] [expr {($firsttab + 2*$repo_config(gui.tabsize)) * $w}]]
 	} elseif {$have_tk85 || $repo_config(gui.tabsize) != 8} {
 		$ui_diff configure -tabs [expr {$repo_config(gui.tabsize) * $w}]
 	} else {
@@ -118,7 +118,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} {
 
 	set cont_info [list $scroll_pos $callback]
 
-	apply_tab_size 0
+	apply_tab_size 1
 
 	if {[string first {U} $m] >= 0} {
 		merge_load_stages $path [list show_unmerged_diff $cont_info]
@@ -420,7 +420,7 @@ proc read_diff {fd conflict_size cont_info} {
 		#
 		if {[string match {@@@ *} $line]} {
 			set is_3way_diff 1
-			apply_tab_size 1
+			apply_tab_size 2
 		}
 
 		if {$::current_diff_inheader} {