diff --git a/app/Http/Controllers/Admin/Widgets/EditWidget.php b/app/Http/Controllers/Admin/Widgets/EditWidget.php
index cc3578f3..2e991d97 100644
--- a/app/Http/Controllers/Admin/Widgets/EditWidget.php
+++ b/app/Http/Controllers/Admin/Widgets/EditWidget.php
@@ -42,7 +42,7 @@ class EditWidget extends Controller
         // update name
         $widget->name = $request->name;
         $widget->container_class = $request->containerClass;
-        $widget->container_id = $request->containerId;
+        $widget->container_id = empty($request->containerId) ? null : $request->containerId;
         $widget->description = $request->description;
 
         // try to save this widget
diff --git a/app/Http/Requests/EditWidgetRequest.php b/app/Http/Requests/EditWidgetRequest.php
index 0395eb1f..8fbf0b05 100644
--- a/app/Http/Requests/EditWidgetRequest.php
+++ b/app/Http/Requests/EditWidgetRequest.php
@@ -13,7 +13,7 @@ class EditWidgetRequest extends Request
     {
         return [
             'name' => 'required',
-            'containerId' => 'unique:widgets,container_id,'.$this->containerId
+            'containerId' => 'unique:widgets,container_id,'.$this->id
         ];
     }
 }