diff --git a/public/js/grocy.js b/public/js/grocy.js
index 344679b4..dbf0ec25 100644
--- a/public/js/grocy.js
+++ b/public/js/grocy.js
@@ -883,11 +883,11 @@ $('a.link-return').not(".btn").each(function()
 	var base = $(this).data('href');
 	if (base.contains('?'))
 	{
-		$(this).attr('href', base + '&returnto' + encodeURIComponent(location.pathname));
+		$(this).attr('href', base + '&returnto' + encodeURIComponent(Grocy.CurrentUrlRelative));
 	}
 	else
 	{
-		$(this).attr('href', base + '?returnto=' + encodeURIComponent(location.pathname));
+		$(this).attr('href', base + '?returnto=' + encodeURIComponent(Grocy.CurrentUrlRelative));
 	}
 
 })
diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php
index 3c8ba59d..765ee903 100644
--- a/views/stockentries.blade.php
+++ b/views/stockentries.blade.php
@@ -195,9 +195,9 @@
 									href="{{ $U('/stockjournal/summary?embedded&product=') }}{{ $stockEntry->product_id }}">
 									{{ $__t('Stock journal summary') }}
 								</a>
-								<a class="dropdown-item"
+								<a class="dropdown-item link-return"
 									type="button"
-									href="{{ $U('/product/') }}{{ $stockEntry->product_id . '?returnto=/stockentries' }}">
+									data-href="{{ $U('/product/') }}{{ $stockEntry->product_id }}">
 									{{ $__t('Edit product') }}
 								</a>
 								<div class="dropdown-divider"></div>
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index bbb322d9..8c088c44 100755
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -291,9 +291,9 @@
 									href="{{ $U('/stockjournal/summary?embedded&product_id=') }}{{ $currentStockEntry->product_id }}">
 									<span class="dropdown-item-text">{{ $__t('Stock journal summary') }}</span>
 								</a>
-								<a class="dropdown-item permission-MASTER_DATA_EDIT"
+								<a class="dropdown-item permission-MASTER_DATA_EDIT link-return"
 									type="button"
-									href="{{ $U('/product/') }}{{ $currentStockEntry->product_id . '?returnto=%2Fstockoverview' }}">
+									data-href="{{ $U('/product/') }}{{ $currentStockEntry->product_id }}">
 									<span class="dropdown-item-text">{{ $__t('Edit product') }}</span>
 								</a>
 								<div class="dropdown-divider"></div>