diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 714bfa594..9ff1fdf4d 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -23,6 +23,7 @@
  - new: workflow activity and hooks for deleting exported files on trash,
         purge, and changeUrl
  - fix: editing posts loses changes in preview
+ - change: Asset::getContainer no longer changes the session asset
 
 7.1.4
  - Template variables in the main Survey Template were out of date in the
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index c15a21e02..b0e447bf6 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -563,7 +563,7 @@ sub getContainer {
 	if (WebGUI::Utility::isIn($self->get("className"), @{$self->session->config->get("assetContainers")})) {
 		return $self;
 	} else {
-		$self->session->asset($self->getParent);
+#		$self->session->asset($self->getParent);
 		return $self->getParent;
 	}
 }
@@ -2011,7 +2011,7 @@ sub www_editSave {
 		if ($self->canEditIfLocked) {
                         $object = $self->addRevision;
                 } else {
-                        return $self->getContainer->www_view;
+                        return $self->session->asset($self->getContainer)->www_view;
                 }
 	}
 
diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm
index cb30600fb..b82471df9 100644
--- a/lib/WebGUI/Asset/Event.pm
+++ b/lib/WebGUI/Asset/Event.pm
@@ -329,7 +329,8 @@ sub www_deleteEventConfirm {
 	} else {
 		$self->trash;
 	}
-	return $self->getParent->getContainer->www_view;;
+
+	return $self->session->asset($self->getParent->getContainer)->www_view;
 }
 
 
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index 82bba6fc3..fbff18d66 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -373,7 +373,7 @@ sub www_view {
 	my $self = shift;
 	return $self->session->privilege->noAccess() unless $self->canView;
 #	if ($self->session->var->get("adminOn")) {
-#		return $self->getContainer->www_view;
+#		return $self->session->asset($self->getContainer)->www_view;
 #	}
 
 	# Kludge for now to make this work with the exporter.
diff --git a/lib/WebGUI/Asset/File/ZipArchive.pm b/lib/WebGUI/Asset/File/ZipArchive.pm
index 8e3accdc9..fce239756 100644
--- a/lib/WebGUI/Asset/File/ZipArchive.pm
+++ b/lib/WebGUI/Asset/File/ZipArchive.pm
@@ -258,7 +258,7 @@ sub www_view {
 	my $self = shift;
 	return $self->session->privilege->noAccess() unless $self->canView;
 	if ($self->session->var->isAdminOn) {
-		return $self->getContainer->www_view;
+		return $self->session->asset($self->getContainer)->www_view;
 	}
 	$self->session->http->setRedirect($self->getFileUrl($self->getValue("showPage")));
 	return "1";
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index 8d95c153d..77d0da6f4 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -623,7 +623,7 @@ sub www_styleWizard {
 #-------------------------------------------------------------------
 sub www_view {
 	my $self = shift;
-	return $self->getContainer->www_view;
+	return $self->session->asset($self->getContainer)->www_view;
 }
 
 
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index 2c1819916..539e9f9a9 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -423,7 +423,8 @@ sub www_vote {
 		}
 		$self->getContainer->purgeCache;
 	}
-	return $self->getContainer->www_view;
+
+	return $self->session->asset($self->getContainer)->www_view;
 }
 
 
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index 55231f3b1..0be20544b 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/lib/WebGUI/AssetClipboard.pm
@@ -169,7 +169,7 @@ sub www_copy {
 	my $newAsset = $self->duplicate;
 	$newAsset->update({ title=>$self->getTitle.' (copy)'});
 	$newAsset->cut;
-	return $self->getContainer->www_view;
+	return $self->session->asset($self->getContainer)->www_view;
 }
 
 #-------------------------------------------------------------------
@@ -225,8 +225,9 @@ sub www_createShortcut {
 		return $self->getParent->www_view;
 	} else {
 		$child->cut;
-		return $self->getContainer->www_manageAssets if ($self->session->form->process("proceed") eq "manageAssets");
-		return $self->getContainer->www_view;
+		$self->session->asset($self->getContainer);
+		return $self->session->asset->www_manageAssets if ($self->session->form->process("proceed") eq "manageAssets");
+		return $self->session->asset->www_view;
 	}
 }
 
diff --git a/lib/WebGUI/AssetLineage.pm b/lib/WebGUI/AssetLineage.pm
index 239534f14..10cf5b89d 100644
--- a/lib/WebGUI/AssetLineage.pm
+++ b/lib/WebGUI/AssetLineage.pm
@@ -724,7 +724,7 @@ sub www_demote {
 	my $self = shift;
 	return $self->session->privilege->insufficient() unless $self->canEdit;
 	$self->demote;
-	return $self->getContainer->www_view; 
+	return $self->session->asset($self->getContainer)->www_view; 
 }
 
 
@@ -740,7 +740,7 @@ sub www_promote {
 	my $self = shift;
 	return $self->session->privilege->insufficient() unless $self->canEdit;
 	$self->promote;
-	return $self->getContainer->www_view;
+	return $self->session->asset($self->getContainer)->www_view;
 }