diff --git a/cicm_web/Areas/Admin/Controllers/ScreensController.cs b/cicm_web/Areas/Admin/Controllers/ScreensController.cs
index 2bf99294..d9c0150d 100644
--- a/cicm_web/Areas/Admin/Controllers/ScreensController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ScreensController.cs
@@ -79,6 +79,11 @@ namespace cicm_web.Areas.Admin.Controllers
             Screen screen = await _context.Screens.FindAsync(id);
             if(screen == null) return NotFound();
 
+            ViewData["NativeResolutionId"] =
+                new
+                    SelectList(_context.Resolutions.OrderBy(r => r.Chars).ThenBy(r => r.Width).ThenBy(r => r.Height).ThenBy(r => r.Colors).Select(r => new {r.Id, Name = r.ToString()}),
+                               "Id", "Name");
+
             return View(screen);
         }
 
@@ -87,8 +92,9 @@ namespace cicm_web.Areas.Admin.Controllers
         // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Edit(int id, [Bind("Width,Height,Diagonal,EffectiveColors,Type,Id")]
-                                              Screen screen)
+        public async Task<IActionResult> Edit(
+            int id, [Bind("Width,Height,Diagonal,EffectiveColors,NativeResolutionId,Type,Id")]
+            Screen screen)
         {
             if(id != screen.Id) return NotFound();
 
@@ -109,6 +115,11 @@ namespace cicm_web.Areas.Admin.Controllers
                 return RedirectToAction(nameof(Index));
             }
 
+            ViewData["NativeResolutionId"] =
+                new
+                    SelectList(_context.Resolutions.OrderBy(r => r.Chars).ThenBy(r => r.Width).ThenBy(r => r.Height).ThenBy(r => r.Colors).Select(r => new {r.Id, Name = r.ToString()}),
+                               "Id", "Name");
+
             return View(screen);
         }
 
diff --git a/cicm_web/Areas/Admin/Views/Screens/Edit.cshtml b/cicm_web/Areas/Admin/Views/Screens/Edit.cshtml
index 29439c46..666df0ea 100644
--- a/cicm_web/Areas/Admin/Views/Screens/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/Screens/Edit.cshtml
@@ -14,6 +14,16 @@
             <div asp-validation-summary="ModelOnly"
                  class="text-danger">
             </div>
+            <div class="form-group">
+                <label asp-for="Diagonal"
+                       class="control-label">
+                </label>
+                <input asp-for="Diagonal"
+                       class="form-control" />
+                <span asp-validation-for="Diagonal"
+                      class="text-danger">
+                </span>
+            </div>
             <div class="form-group">
                 <label asp-for="Width"
                        class="control-label">
@@ -35,12 +45,14 @@
                 </span>
             </div>
             <div class="form-group">
-                <label asp-for="Diagonal"
+                <label asp-for="NativeResolution"
                        class="control-label">
                 </label>
-                <input asp-for="Diagonal"
-                       class="form-control" />
-                <span asp-validation-for="Diagonal"
+                <select asp-for="NativeResolutionId"
+                        class="form-control"
+                        asp-items="ViewBag.NativeResolutionId">
+                </select>
+                <span asp-validation-for="NativeResolutionId"
                       class="text-danger">
                 </span>
             </div>
@@ -70,11 +82,16 @@
                 <input class="btn btn-primary"
                        type="submit"
                        value="Save" />
+
+                <a asp-action="Index"
+                   class="btn btn-secondary">
+                    Back to List
+                </a>
             </div>
         </form>
     </div>
 </div>
 
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
\ No newline at end of file
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index 4e1ecb0a..5cb34413 100644
--- a/cicm_web/cicm_web.csproj
+++ b/cicm_web/cicm_web.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>3.0.99.729</Version>
+    <Version>3.0.99.730</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>