From e68aa7c0275132e334114fb2d1a7a49716dedb88 Mon Sep 17 00:00:00 2001
From: Fulvio Notarstefano <fulvio.notarstefano@gmail.com>
Date: Thu, 7 Jun 2018 23:33:13 +0900
Subject: [PATCH] [#20404] Address code review feedback

---
 includes/admin/settings/views/html-webhooks-edit.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/includes/admin/settings/views/html-webhooks-edit.php b/includes/admin/settings/views/html-webhooks-edit.php
index e319db0d1b8..96009d65cbe 100644
--- a/includes/admin/settings/views/html-webhooks-edit.php
+++ b/includes/admin/settings/views/html-webhooks-edit.php
@@ -85,8 +85,11 @@ if ( ! defined( 'ABSPATH' ) ) {
 							);
 
 							foreach ( $topics as $topic_slug => $topic_name ) :
-								?>
-							<option value="<?php echo esc_attr( $topic_slug ); ?>" <?php selected( $topic_data['resource'] . '.' . $topic_data['event'], $topic_slug, true ); ?>><?php echo esc_html( $topic_name ); ?></option>
+
+							$selected = $topic_slug === $topic_data['topic'] || $topic_slug === $topic_data['resource'] . '.' . $topic_data['event'];
+
+							?>
+							<option value="<?php echo esc_attr( $topic_slug ); ?>" <?php selected( $selected, true, true ); ?>><?php echo esc_html( $topic_name ); ?></option>
 						<?php endforeach; ?>
 					</select>
 				</td>