diff --git a/classes/popovers/class-popover.php b/classes/popovers/class-popover.php
index 2d60597d5..c74e80b81 100644
--- a/classes/popovers/class-popover.php
+++ b/classes/popovers/class-popover.php
@@ -41,7 +41,6 @@ public function render_button() {
 	 */
 	public function render() {
 		?>
-		<?php $this->render_button(); ?>
 		<div id="prpl-popover-<?php echo \esc_attr( $this->id ); ?>" class="prpl-popover" popover>
 			<!-- The content. -->
 			<?php $this->the_content(); ?>
diff --git a/views/admin-page-header.php b/views/admin-page-header.php
index cfbf4edd2..0d5383e35 100644
--- a/views/admin-page-header.php
+++ b/views/admin-page-header.php
@@ -27,6 +27,7 @@
 			<span class="dashicons dashicons-lightbulb"></span>
 			<span class="screen-reader-text"><?php \esc_html_e( 'Start tour', 'progress-planner' ); ?>
 		</button>
+		<?php \progress_planner()->get_popovers()->settings->render_button(); ?>
 		<?php \progress_planner()->get_popovers()->settings->render(); ?>
 		<div class="prpl-header-select-range">
 			<label for="prpl-select-range" class="screen-reader-text">
diff --git a/views/page-widgets/badge-streak.php b/views/page-widgets/badge-streak.php
index 36afd50f9..44c3ef428 100644
--- a/views/page-widgets/badge-streak.php
+++ b/views/page-widgets/badge-streak.php
@@ -51,6 +51,7 @@
 
 <h2 class="prpl-widget-title">
 	<?php \esc_html_e( 'Your streak badges', 'progress-planner' ); ?>
+	<?php \progress_planner()->get_popovers()->badges->render_button(); ?>
 	<?php \progress_planner()->get_popovers()->badges->render(); ?>
 </h2>