diff --git a/list-virtual.php b/list-virtual.php
index 01de2341..f5f1cfb1 100644
--- a/list-virtual.php
+++ b/list-virtual.php
@@ -33,6 +33,7 @@ require_once('common.php');
 
 authentication_require_role('admin');
 
+$fDomain = false;
 $SESSID_USERNAME = authentication_get_username();
 
 if (authentication_has_role('global-admin')) {
@@ -59,6 +60,12 @@ else
     if (isset ($_POST['limit'])) $fDisplay = intval ($_POST['limit']);
 }
 
+// store fDomain in $_SESSION so after adding/editing aliases/mailboxes we can 
+// take the user back to the appropriate domain listing. (see templates/menu.php)
+if($fDomain) {
+    $_SESSION['list_virtual_sticky_domain'] = $fDomain;
+}
+
 if (count($list_domains) == 0) {
     #   die("no domains");
     header("Location: list-domain.php"); # no domains (for this admin at least) - redirect to domain list
diff --git a/templates/create-alias.php b/templates/create-alias.php
index f4dee2f2..d2f32632 100644
--- a/templates/create-alias.php
+++ b/templates/create-alias.php
@@ -1,4 +1,5 @@
 <?php if( !defined('POSTFIXADMIN') ) die( "This file cannot be used standalone." ); ?>
+<!-- 'breadcrumb' -->
 <div id="edit_form">
 <form name="alias" method="post">
 <table>
diff --git a/templates/create-mailbox.php b/templates/create-mailbox.php
index 2c6cde86..49b4db51 100644
--- a/templates/create-mailbox.php
+++ b/templates/create-mailbox.php
@@ -1,4 +1,9 @@
 <?php if( !defined('POSTFIXADMIN') ) die( "This file cannot be used standalone." ); ?>
+<?php
+if(isset($_SESSION['list_virtual_sticky_domain'])) {
+    echo "<a href='list-virtual.php?domain=" . htmlentities($_SESSION['list_virtual_sticky_domain'], ENT_QUOTES) . "'>" . $PALANG['pAdminMenu_list_virtual'] . "</a>";
+}
+?>
 <div id="edit_form">
 <form name="mailbox" method="post">
 <table>
diff --git a/templates/menu.php b/templates/menu.php
index 8955fa67..0788a409 100644
--- a/templates/menu.php
+++ b/templates/menu.php
@@ -41,7 +41,12 @@ if (authentication_has_role('global-admin')) {
 }
 
 print _menulink("list-domain.php", $PALANG['pAdminMenu_list_domain'], $submenu_domain);
-print _menulink("list-virtual.php", $PALANG['pAdminMenu_list_virtual'], $submenu_virtual);
+
+$link = 'list-virtual.php';
+if(isset($_SESSION['list_virtual_sticky_domain'])) {
+    $link = "list-virtual.php?domain=" . htmlentities($_SESSION['list_virtual_sticky_domain'], ENT_QUOTES);
+}
+print _menulink($link, $PALANG['pAdminMenu_list_virtual'], $submenu_virtual);
 
 if ($CONF['fetchmail'] == 'YES') {
    print _menulink("fetchmail.php", $PALANG['pMenu_fetchmail'], $submenu_fetchmail);