diff --git a/src/popups/file_revlog.rs b/src/popups/file_revlog.rs
index 6bbbffbe8a..62acf1c7e5 100644
--- a/src/popups/file_revlog.rs
+++ b/src/popups/file_revlog.rs
@@ -251,8 +251,8 @@ impl FileRevlogPopup {
 		};
 		let revisions = self.get_max_selection();
 
-		self.open_request.as_ref().map_or(
-			"<no history available>".into(),
+		self.open_request.as_ref().map_or_else(
+			|| "<no history available>".into(),
 			|open_request| {
 				strings::file_log_title(
 					&open_request.file_path,
diff --git a/src/popups/push.rs b/src/popups/push.rs
index 8bf1bdcb15..b7dff07123 100644
--- a/src/popups/push.rs
+++ b/src/popups/push.rs
@@ -195,8 +195,8 @@ impl PushPopup {
 	pub fn get_progress(
 		progress: Option<&RemoteProgress>,
 	) -> (String, u8) {
-		progress.as_ref().map_or(
-			(strings::PUSH_POPUP_PROGRESS_NONE.into(), 0),
+		progress.as_ref().map_or_else(
+			|| (strings::PUSH_POPUP_PROGRESS_NONE.into(), 0),
 			|progress| {
 				(
 					Self::progress_state_name(&progress.state),
diff --git a/src/popups/push_tags.rs b/src/popups/push_tags.rs
index 07d139f3b5..420df0b860 100644
--- a/src/popups/push_tags.rs
+++ b/src/popups/push_tags.rs
@@ -131,8 +131,8 @@ impl PushTagsPopup {
 	pub fn get_progress(
 		progress: Option<&PushTagsProgress>,
 	) -> (String, u8) {
-		progress.as_ref().map_or(
-			(strings::PUSH_POPUP_PROGRESS_NONE.into(), 0),
+		progress.as_ref().map_or_else(
+			|| (strings::PUSH_POPUP_PROGRESS_NONE.into(), 0),
 			|progress| {
 				(
 					Self::progress_state_name(progress),