diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
index 9c7fa0a0b..9431da0bc 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
@@ -69,7 +69,8 @@ namespace Orchard.Widgets.Controllers {
             }
 
             LayerPart currentLayer = layerId == null
-                ? layers.FirstOrDefault(x => x.Name == "Default")
+                // look for the "Default" layer, or take the first if it doesn't exist
+                ? layers.FirstOrDefault(x => x.Name == "Default") ?? layers.FirstOrDefault()
                 : layers.FirstOrDefault(layer => layer.Id == layerId);
 
             if (currentLayer == null && layerId != null) { // Incorrect layer id passed