diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 43b42b1be..0aa52509b 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -11,6 +11,8 @@
  - fixed: EMS 2.0 migration badges
  - fixed: per item shipping
  - fixed: product title problem
+ - Fixed a bug where ShipDriver and ShopDriver would ignore the gateway url
+   after adding or editing a driver.
 
 7.5.18
  - fixed: Collateral Image Manager broken in Firefox 3
diff --git a/lib/WebGUI/Shop/PayDriver.pm b/lib/WebGUI/Shop/PayDriver.pm
index 6847d0af9..73d5492f3 100644
--- a/lib/WebGUI/Shop/PayDriver.pm
+++ b/lib/WebGUI/Shop/PayDriver.pm
@@ -821,7 +821,7 @@ sub www_editSave {
     return $session->privilege->insufficient() unless $session->user->isInGroup(3);
 
     $self->processPropertiesFromFormPost;
-    $session->http->setRedirect("/?shop=pay;method=manage");
+    $session->http->setRedirect($session->url->page('shop=pay;method=manage'));
 
     return undef;
 }
diff --git a/lib/WebGUI/Shop/ShipDriver.pm b/lib/WebGUI/Shop/ShipDriver.pm
index aa517a5ca..9778277b1 100644
--- a/lib/WebGUI/Shop/ShipDriver.pm
+++ b/lib/WebGUI/Shop/ShipDriver.pm
@@ -342,7 +342,7 @@ sub www_editSave {
     my $session = $self->session;
     return $session->privilege->insufficient() unless $session->user->isInGroup(3);
     $self->processPropertiesFromFormPost;
-    $session->http->setRedirect("/?shop=ship;method=manage");
+    $session->http->setRedirect($session->url->page('shop=ship;method=manage'));
     return undef;
 }