diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 076672e68..f750caa7a 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -2,6 +2,7 @@
  - User search now includes user alias.
  - Fixed a bug in the user manager where userId, date created, date updated,
    and karma were not showing up when editing users.
+ - fix [ 1274239 ] Can Not Save Edits to Assets
 
 
 6.7.2
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index a8a39f81e..c492d4a08 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1395,8 +1395,11 @@ sub www_editSave {
 		$object = $self->addChild({className=>$session{form}{class}});	
 		$object->{_parent} = $self;
 	} else {
-		return $self->getContainer->www_view if ($self->canEditIfLocked || !$self->isLocked);
-		$object = $self->addRevision;
+		if ($self->canEditIfLocked || !$self->isLocked) {
+                        $object = $self->addRevision;
+                } else {
+                        return $self->getContainer->www_view;
+                }
 	}
 	$object->processPropertiesFromFormPost;
 	$object->updateHistory("edited");