diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 2d2468418..4046012fb 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -31,6 +31,7 @@
  - fix [ 1488556 ] blank page after setup
  - fix [ 1489528 ] HTTP header contains invalid time-stamp
  - Added the quick() convenience method to WebGUI::Session.
+ - fix [ 1487054 ] 6.99 Orphaning ads in AdSpace
 
 
 6.99.0
diff --git a/lib/WebGUI/Operation/AdSpace.pm b/lib/WebGUI/Operation/AdSpace.pm
index 3d0b3601d..9bfc44e5a 100644
--- a/lib/WebGUI/Operation/AdSpace.pm
+++ b/lib/WebGUI/Operation/AdSpace.pm
@@ -268,15 +268,15 @@ sub www_editAdSpace {
 	my $adSpace = shift;
 	return $session->privilege->insufficient unless ($session->user->isInGroup("pbgroup000000000000017"));
 	my $id;
+	my $i18n = WebGUI::International->new($session,"AdSpace");
+	my $ac = WebGUI::AdminConsole->new($session,"adSpace");
 	if (defined $adSpace) {
 		$id = $adSpace->getId;
+		$ac->addSubmenuItem($session->url->page("op=editAd;adSpaceId=".$id), $i18n->get("add an ad")) if defined $adSpace;
 	} else {
 		$id = $session->form->param("adSpaceId") || "new";
 		$adSpace = WebGUI::AdSpace->new($session, $id);
 	}
-	my $ac = WebGUI::AdminConsole->new($session,"adSpace");
-	my $i18n = WebGUI::International->new($session,"AdSpace");
-	$ac->addSubmenuItem($session->url->page("op=editAd;adSpaceId=".$id), $i18n->get("add an ad")) if defined $adSpace;
 	$ac->addSubmenuItem($session->url->page("op=manageAdSpaces"), $i18n->get("manage ad spaces"));
 	my $f = WebGUI::HTMLForm->new($session);
 	$f->submit;