diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php
index 4b13541229..a0e3096dd5 100644
--- a/framework/base/helper.class.php
+++ b/framework/base/helper.class.php
@@ -170,7 +170,7 @@ class baseHelper
 
         $sign = !str_contains($link, '?') ? "?" : "&";
         $appendString = '';
-        if($onlyBody) $appendString = $sign . "onlybody=yes";
+        if($onlyBody or (self::inOnlyBodyMode() && !self::isAjaxRequest('modal'))) $appendString = $sign . "onlybody=yes";
         if(self::isWithTID() and !str_contains($link, 'tid=')) $appendString .= empty($appendString) ? "{$sign}tid={$_GET['tid']}" : "&tid={$_GET['tid']}";
         return $link . $appendString;
     }