diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index cec0bbcba861..b2d587c1a8b4 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -338,7 +338,13 @@ class UserController extends BaseController
             }
         }
 
-        return Redirect::to($referer);
+        // If the user is looking at an entity redirect to the dashboard
+        preg_match('/\/[0-9*][\/edit]*$/', $referer, $matches);
+        if (count($matches)) {
+            return Redirect::to('/dashboard');
+        } else {
+            return Redirect::to($referer);
+        }
     }
 
     public function unlinkAccount($userAccountId, $userId)