diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 236d28ebd6..4221c8eae7 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -296,7 +296,7 @@ class AssetsController extends Controller
     * @since [v1.0]
     * @return Redirect
     */
-    public function postEdit($assetId = null)
+    public function postEdit($assetId = null, AssetRequest $request)
     {
         // Check if the asset exists
         if (is_null($asset = Asset::find($assetId))) {
@@ -390,10 +390,11 @@ class AssetsController extends Controller
         // Was the asset updated?
         if ($asset->save()) {
             // Redirect to the new asset page
-            return redirect()->to("hardware/$assetId/view")->with('success', trans('admin/hardware/message.update.success'));
+            \Session::flash('success', trans('admin/hardware/message.update.success'));
+            return response()->json(['redirect_url' => route("view/hardware", $assetId)]);
         }
 
-        return redirect()->back()->withInput()->withErrors($asset->getErrors());
+        return response()->json(['errors' => $asset->getErrors()]);
 
     }
 
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index c03bc42363..d6627716f4 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -511,7 +511,7 @@ $(function () {
       dataType: 'json',
       success: function(data) {
         // AssetController flashes success to session, redirect to hardware page.
-        window.location.href = successRoute;
+        window.location.href = data.redirect_url;
       },
       error: function(data) {
         // AssetRequest Validator will flash all errors to session, this just refreshes to see them.