diff --git a/crates/bevy_dev_tools/Cargo.toml b/crates/bevy_dev_tools/Cargo.toml
index ad0f2c515c..5f05af1d07 100644
--- a/crates/bevy_dev_tools/Cargo.toml
+++ b/crates/bevy_dev_tools/Cargo.toml
@@ -19,6 +19,7 @@ bevy_color = { path = "../bevy_color", version = "0.16.0-dev" }
 bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.16.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.16.0-dev" }
 bevy_input = { path = "../bevy_input", version = "0.16.0-dev" }
+bevy_math = { path = "../bevy_math", version = "0.16.0-dev" }
 bevy_picking = { path = "../bevy_picking", version = "0.16.0-dev" }
 bevy_render = { path = "../bevy_render", version = "0.16.0-dev" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-dev" }
diff --git a/crates/bevy_dev_tools/src/frame_time_graph/mod.rs b/crates/bevy_dev_tools/src/frame_time_graph/mod.rs
index 7ffab5077b..6fad18765f 100644
--- a/crates/bevy_dev_tools/src/frame_time_graph/mod.rs
+++ b/crates/bevy_dev_tools/src/frame_time_graph/mod.rs
@@ -4,6 +4,7 @@ use bevy_app::{Plugin, Update};
 use bevy_asset::{load_internal_asset, weak_handle, Asset, Assets, Handle};
 use bevy_diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin};
 use bevy_ecs::system::{Res, ResMut};
+use bevy_math::ops::log2;
 use bevy_reflect::TypePath;
 use bevy_render::{
     render_resource::{AsBindGroup, Shader, ShaderRef, ShaderType},
@@ -59,8 +60,8 @@ impl FrameTimeGraphConfigUniform {
         Self {
             dt_min,
             dt_max,
-            dt_min_log2: dt_min.log2(),
-            dt_max_log2: dt_max.log2(),
+            dt_min_log2: log2(dt_min),
+            dt_max_log2: log2(dt_max),
             proportional_width: u32::from(proportional_width),
         }
     }
@@ -92,7 +93,7 @@ fn update_frame_time_values(
     diagnostics_store: Res<DiagnosticsStore>,
     config: Option<Res<FpsOverlayConfig>>,
 ) {
-    if !config.map_or(true, |c| c.frame_time_graph_config.enabled) {
+    if !config.is_none_or(|c| c.frame_time_graph_config.enabled) {
         return;
     }
     let Some(frame_time) = diagnostics_store.get(&FrameTimeDiagnosticsPlugin::FRAME_TIME) else {