diff --git a/Interfaces/IPluginRegister.cs b/Interfaces/IPluginRegister.cs
index e68fa0d20..aa9a1c769 100644
--- a/Interfaces/IPluginRegister.cs
+++ b/Interfaces/IPluginRegister.cs
@@ -69,9 +69,11 @@ public interface IPluginRegister
     /// <returns>List of floppy image plugins</returns>
     List<Type> GetAllFloppyImagePlugins();
 
-    /// <summary>Gets all media image plugins</summary>
-    /// <returns>List of media image plugins</returns>
-    List<Type> GetAllMediaImagePlugins();
+    /// <summary>
+    ///     Registers all media image plugins in the provided service collection
+    /// </summary>
+    /// <param name="services">Service collection</param>
+    void RegisterMediaImagePlugins(IServiceCollection services);
 
     /// <summary>
     ///     Registers all partition plugins in the provided service collection
diff --git a/PluginRegister.cs b/PluginRegister.cs
index ca47f9068..96e172bef 100644
--- a/PluginRegister.cs
+++ b/PluginRegister.cs
@@ -49,8 +49,6 @@ public class PluginRegister
 
     /// <summary>List of floppy image plugins</summary>
     public readonly SortedDictionary<string, Type> FloppyImages;
-    /// <summary>List of all media image plugins</summary>
-    public readonly SortedDictionary<string, Type> MediaImages;
     /// <summary>List of writable floppy image plugins</summary>
     public readonly SortedDictionary<string, Type> WritableFloppyImages;
     /// <summary>List of writable media image plugins</summary>
@@ -60,13 +58,25 @@ public class PluginRegister
 
     PluginRegister()
     {
-        MediaImages           = new SortedDictionary<string, Type>();
         WritableImages        = new SortedDictionary<string, Type>();
         FloppyImages          = new SortedDictionary<string, Type>();
         WritableFloppyImages  = new SortedDictionary<string, Type>();
         ByteAddressableImages = new SortedDictionary<string, Type>();
     }
 
+    /// <summary>List of all media image plugins</summary>
+    public SortedDictionary<string, IMediaImage> MediaImages
+    {
+        get
+        {
+            SortedDictionary<string, IMediaImage> mediaImages = new();
+            foreach(IMediaImage plugin in _serviceProvider.GetServices<IMediaImage>())
+                mediaImages[plugin.Name.ToLower()] = plugin;
+
+            return mediaImages;
+        }
+    }
+
     /// <summary>List of read-only filesystem plugins</summary>
     public SortedDictionary<string, IReadOnlyFilesystem> ReadOnlyFilesystems
     {
@@ -195,12 +205,7 @@ public class PluginRegister
                 FloppyImages.Add(plugin.Name.ToLower(), type);
         }
 
-        foreach(Type type in pluginRegister.GetAllMediaImagePlugins() ?? Enumerable.Empty<Type>())
-        {
-            if(Activator.CreateInstance(type) is IMediaImage plugin && !MediaImages.ContainsKey(plugin.Name.ToLower()))
-                MediaImages.Add(plugin.Name.ToLower(), type);
-        }
-
+        pluginRegister.RegisterMediaImagePlugins(_services);
         pluginRegister.RegisterPartitionPlugins(_services);
 
         foreach(Type type in pluginRegister.GetAllWritableFloppyImagePlugins() ?? Enumerable.Empty<Type>())