diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 0520c87cc1b18..46a63db18b3a1 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -203,8 +203,17 @@
 							{{range .PushMirrors}}
 							<tr>
 								<td class="tw-break-anywhere">{{.RemoteAddress}}</td>
-								<td>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
-								<td>{{if .LastUpdateUnix}}{{DateUtils.FullTime .LastUpdateUnix}}{{else}}{{ctx.Locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{ctx.Locale.Tr "error"}}</div>{{end}}</td>
+								<td>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.push"}} ({{.Interval}})</td>
+								<td>
+									<span class="flex-text-block">
+										{{if .LastUpdateUnix}}
+											{{DateUtils.FullTime .LastUpdateUnix}}
+										{{else}}
+											{{ctx.Locale.Tr "never"}}
+										{{end}}
+										{{if .LastError}}<span class="ui red label" data-tooltip-content="{{.LastError}}">{{ctx.Locale.Tr "error"}}</span>{{end}}
+									</span>
+								</td>
 								<td class="right aligned">
 									<button
 										class="ui tiny button show-modal"
diff --git a/templates/repo/settings/push_mirror_sync_modal.tmpl b/templates/repo/settings/push_mirror_sync_modal.tmpl
index e8dad61a48702..3bd624fab799c 100644
--- a/templates/repo/settings/push_mirror_sync_modal.tmpl
+++ b/templates/repo/settings/push_mirror_sync_modal.tmpl
@@ -2,31 +2,27 @@
 	<div class="header">
 		{{ctx.Locale.Tr "repo.settings.mirror_settings.push_mirror.edit_sync_time"}}
 	</div>
-	<div class="content">
-		<form class="ui form ignore-dirty" method="post">
-			{{.CsrfTokenHtml}}
-			<input type="hidden" name="action" value="push-mirror-update">
-			<input type="hidden" name="push_mirror_id" id="push-mirror-edit-id">
-			<div class="field">
-				<label for="name">{{ctx.Locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</label>
-				<div class="ui small input">
-					<input id="push-mirror-edit-address" readonly>
-				</div>
-			</div>
-			<div class="inline field">
-				<label for="push-mirror-edit-interval">{{ctx.Locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
-				<input id="push-mirror-edit-interval" name="push_mirror_interval" autofocus>
-			</div>
-			<div class="actions">
-				<button class="ui small basic cancel button">
-					{{svg "octicon-x"}}
-					{{ctx.Locale.Tr "cancel"}}
-				</button>
-				<button class="ui primary small approve button">
-					{{svg "fontawesome-save"}}
-					{{ctx.Locale.Tr "save"}}
-				</button>
-			</div>
-		</form>
-	</div>
+	<form class="content ui form ignore-dirty" method="post">
+		{{.CsrfTokenHtml}}
+		<input type="hidden" name="action" value="push-mirror-update">
+		<input type="hidden" name="push_mirror_id" id="push-mirror-edit-id">
+		<div class="field">
+			<label>{{ctx.Locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</label>
+			<span id="push-mirror-edit-address"></span>
+		</div>
+		<div class="field">
+			<label for="push-mirror-edit-interval">{{ctx.Locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
+			<input id="push-mirror-edit-interval" name="push_mirror_interval" class="tw-w-auto">
+		</div>
+		<div class="actions">
+			<button class="ui small basic cancel button">
+				{{svg "octicon-x"}}
+				{{ctx.Locale.Tr "cancel"}}
+			</button>
+			<button class="ui primary small approve button">
+				{{svg "fontawesome-save"}}
+				{{ctx.Locale.Tr "save"}}
+			</button>
+		</div>
+	</form>
 </div>