diff --git a/data/resources/ui/components-media-content-viewer.ui b/data/resources/ui/components-media-content-viewer.ui
index d32b1efe..8c117e94 100644
--- a/data/resources/ui/components-media-content-viewer.ui
+++ b/data/resources/ui/components-media-content-viewer.ui
@@ -7,8 +7,7 @@
           <object class="GtkStackPage">
             <property name="name">loading</property>
             <property name="child">
-              <object class="GtkSpinner">
-                <property name="spinning">true</property>
+              <object class="Spinner" id="spinner">
                 <property name="valign">center</property>
                 <property name="halign">center</property>
                 <property name="vexpand">True</property>
diff --git a/src/components/media_content_viewer.rs b/src/components/media_content_viewer.rs
index 98cf69db..492bd33e 100644
--- a/src/components/media_content_viewer.rs
+++ b/src/components/media_content_viewer.rs
@@ -4,7 +4,7 @@ use gettextrs::gettext;
 use gtk::{gdk, gio, glib, glib::clone, CompositeTemplate};
 use log::warn;
 
-use super::{AudioPlayer, ImagePaintable, LocationViewer};
+use super::{AudioPlayer, ImagePaintable, LocationViewer, Spinner};
 use crate::spawn;
 
 #[derive(Debug, Default, Clone, Copy)]
@@ -57,6 +57,8 @@ mod imp {
         pub viewer: TemplateChild<adw::Bin>,
         #[template_child]
         pub fallback: TemplateChild<adw::StatusPage>,
+        #[template_child]
+        pub spinner: TemplateChild<Spinner>,
     }
 
     #[glib::object_subclass]