diff --git a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
index 389c620637..3026064dec 100644
--- a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
+++ b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Core.Configuration.Grid
 {
-    class GridEditorsConfig : IGridEditorsConfig
+    internal class GridEditorsConfig : IGridEditorsConfig
     {
         private readonly ILogger _logger;
         private readonly IRuntimeCacheProvider _runtimeCache;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index 7198166c25..21f9534848 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -26,6 +26,7 @@ angular.module("umbraco")
                 $scope.control.value = {
                     focalPoint: selectedImage.focalPoint,
                     id: selectedImage.id,
+                    udi: selectedImage.udi,
                     image: selectedImage.image,
                     altText: selectedImage.altText
                 };