diff --git a/gitk b/gitk
index 8ffc10a9e5..3909445d8a 100755
--- a/gitk
+++ b/gitk
@@ -667,7 +667,7 @@ proc makewindow {} {
     pack .bright.sb -side right -fill y
     pack $cflist -side left -fill both -expand 1
     $cflist tag configure highlight \
-	-background [$cflist cget -selectbackground]
+	-background [$cflist cget -highlightbackground]
     $cflist tag configure bold -font [concat $mainfont bold]
 
     .pwbottom add .bright
@@ -1755,7 +1755,7 @@ proc bolden {row font} {
 	$canv delete secsel
 	set t [eval $canv create rect [$canv bbox $linehtag($row)] \
 		   -outline {{}} -tags secsel \
-		   -fill [$canv cget -selectbackground]]
+		   -fill [$canv cget -highlightbackground]]
 	$canv lower $t
     }
 }
@@ -1769,7 +1769,7 @@ proc bolden_name {row font} {
 	$canv2 delete secsel
 	set t [eval $canv2 create rect [$canv2 bbox $linentag($row)] \
 		   -outline {{}} -tags secsel \
-		   -fill [$canv2 cget -selectbackground]]
+		   -fill [$canv2 cget -highlightbackground]]
 	$canv2 lower $t
     }
 }
@@ -3885,15 +3885,15 @@ proc selectline {l isnew} {
     if {![info exists linehtag($l)]} return
     $canv delete secsel
     set t [eval $canv create rect [$canv bbox $linehtag($l)] -outline {{}} \
-	       -tags secsel -fill [$canv cget -selectbackground]]
+	       -tags secsel -fill [$canv cget -highlightbackground]]
     $canv lower $t
     $canv2 delete secsel
     set t [eval $canv2 create rect [$canv2 bbox $linentag($l)] -outline {{}} \
-	       -tags secsel -fill [$canv2 cget -selectbackground]]
+	       -tags secsel -fill [$canv2 cget -highlightbackground]]
     $canv2 lower $t
     $canv3 delete secsel
     set t [eval $canv3 create rect [$canv3 bbox $linedtag($l)] -outline {{}} \
-	       -tags secsel -fill [$canv3 cget -selectbackground]]
+	       -tags secsel -fill [$canv3 cget -highlightbackground]]
     $canv3 lower $t
 
     if {$isnew} {