diff --git a/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php b/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php
index 819600e5..e2a9b834 100644
--- a/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php
+++ b/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php
@@ -4,9 +4,12 @@ namespace App\Http\Controllers\Admin\Widgets\Areas;
 
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditWidgetAreaRequest;
+use App\Models\Widget;
 use App\Models\WidgetArea;
+use App\Models\WidgetInWidgetArea;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Facades\Event;
+use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 class EditWidgetArea extends Controller
 {
@@ -20,8 +23,15 @@ class EditWidgetArea extends Controller
     public function getEdit($id)
     {
         $area = WidgetArea::findOrFail($id);
+        $associatedWidgetIds = WidgetInWidgetArea::getWidgetIdsFromArea($area->id);
+        $widgets = Widget::where('language', LaravelLocalization::getCurrentLocale())
+                         ->paginate(25);
 
-        return view('admin.widgets.area.edit', ['area' => $area]);
+        return view('admin.widgets.area.edit', [
+            'area'                => $area,
+            'widgets'             => $widgets,
+            'associatedWidgetIds' => $associatedWidgetIds
+        ]);
     }
 
     /**
diff --git a/app/Http/Controllers/Admin/Widgets/AssociateWidget.php b/app/Http/Controllers/Admin/Widgets/AssociateWidget.php
index e254281f..80a8531b 100644
--- a/app/Http/Controllers/Admin/Widgets/AssociateWidget.php
+++ b/app/Http/Controllers/Admin/Widgets/AssociateWidget.php
@@ -45,7 +45,7 @@ class AssociateWidget extends Controller
         Event::fire(new AssignWidget($widget, $widgetArea));
 
         return redirect()
-            ->route('widgets.associate', ['widgetArea' => $widgetAreaId])
+            ->back()
             ->with('success', trans('admin/widgets.successfullyAssociated'));
     }
 
diff --git a/resources/views/admin/widgets/area/edit.blade.php b/resources/views/admin/widgets/area/edit.blade.php
index e38f4d70..67900ed5 100644
--- a/resources/views/admin/widgets/area/edit.blade.php
+++ b/resources/views/admin/widgets/area/edit.blade.php
@@ -3,6 +3,19 @@
 @section('pageHeading', @trans('admin/widgetAreas.edit', ['name' => $area->name]))
 
 @section('content')
-    @include('admin.widgets.area.form', ['action' => route('widgetareas.postEdit', ['id' => $area->id])])
-@stop
+    <div class="row">
+        <div class="col-lg-8">
+            @include('admin.widgets.area.form', ['action' => route('widgetareas.postEdit', ['id' => $area->id])])
+
+            <h2 class="m-t-15">@lang('admin/widgets.overview')</h2>
+            @include('admin.widgets.widgetsToAssociate', ['tileClass' => 'col-md-4 col-sm-6 col-xs-12', 'widgetArea' => $area])
+
+        </div>
+        <div class="col-lg-4">
+            <h3>@lang('admin/widgets.preview')</h3>
+
+            @widgetArea($area->code)
+        </div>
+    </div>
+@endsection