diff --git a/vanilla/applications/dashboard/controllers/class.entrycontroller.php b/vanilla/applications/dashboard/controllers/class.entrycontroller.php
index 05bc72a..8a7f565 100644
--- a/vanilla/applications/dashboard/controllers/class.entrycontroller.php
+++ b/vanilla/applications/dashboard/controllers/class.entrycontroller.php
@@ -377,9 +377,9 @@ protected function checkOverride($type, $target, $transientKey = null) {
             $remoteUrl = c("Garden.Embed.RemoteUrl");
 
             // FIX Issues-681: signing from Forum
-            $forceEmbed = $this->Request->get('Source', '') != 'forum';
-
-            if($isEmbedded && is_string( $remoteUrl) && $forceEmbed) {
+            //$forceEmbed = $this->Request->get('Source', '') != 'forum';
+            $referer = $_SERVER['HTTP_REFERER'];
+            if($isEmbedded && is_string( $remoteUrl) && $referer != '' && strpos($referer, $remoteUrl) !== false) {
                 $targetUrl = rawurlencode($remoteUrl.'/#'.url($target));
             } else {
                 $targetUrl = rawurlencode(url($target, true));