diff --git a/crates/notedeck_columns/src/ui/note/contents.rs b/crates/notedeck_columns/src/ui/note/contents.rs
index 3d34cc9a..c3368a9e 100644
--- a/crates/notedeck_columns/src/ui/note/contents.rs
+++ b/crates/notedeck_columns/src/ui/note/contents.rs
@@ -370,6 +370,7 @@ fn image_carousel(
         let cache_type = current_image.clone().1;
 
         Window::new("image_popup")
+            .order(egui::Order::Foreground)
             .title_bar(false)
             .fixed_size(ui.ctx().screen_rect().size())
             .frame(egui::Frame::none())
diff --git a/crates/notedeck_columns/src/ui/timeline.rs b/crates/notedeck_columns/src/ui/timeline.rs
index 1ebf10b5..6caa8901 100644
--- a/crates/notedeck_columns/src/ui/timeline.rs
+++ b/crates/notedeck_columns/src/ui/timeline.rs
@@ -119,7 +119,7 @@ fn timeline_ui(
     let goto_top_resp = if show_top_button {
         let top_button_pos = ui.available_rect_before_wrap().right_top() - vec2(48.0, -24.0);
         egui::Area::new(ui.id().with("foreground_area"))
-            .order(egui::Order::Foreground)
+            .order(egui::Order::Middle)
             .fixed_pos(top_button_pos)
             .show(ui.ctx(), |ui| Some(ui.add(goto_top_button(top_button_pos))))
             .inner