diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
index ee7d21b765..7cd302c7df 100644
--- a/src/wp-admin/css/themes.css
+++ b/src/wp-admin/css/themes.css
@@ -249,7 +249,6 @@ body.js .theme-browser.search-loading {
 
 .theme-browser .theme.display-author .theme-author a {
 	color: inherit;
-	text-decoration: none;
 }
 
 /**
@@ -679,11 +678,6 @@ body.folded .theme-browser ~ .theme-overlay .theme-wrap {
 	line-height: inherit;
 }
 
-.theme-overlay .theme-author a,
-.theme-overlay .theme-autoupdate a {
-	text-decoration: none;
-}
-
 .theme-overlay .toggle-auto-update {
 	/* Better align spin icon and text. */
 	display: inline-flex;
@@ -693,6 +687,14 @@ body.folded .theme-browser ~ .theme-overlay .theme-wrap {
 	vertical-align: top;
 }
 
+.theme-overlay .theme-autoupdate .toggle-auto-update {
+	text-decoration: none;
+}
+
+.theme-overlay .theme-autoupdate .toggle-auto-update .label {
+	text-decoration: underline;
+}
+
 .theme-overlay .theme-description {
 	color: #555;
 	font-size: 15px;