diff --git a/CHANGELOG b/CHANGELOG
index 12c2e11c9..cb9f46ec2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -156,6 +156,7 @@
 - clipboard can be pinned to fixed position
 - use standard output for document rows on MyDocuments page
 - new seeddms logo
+- fix moving clipboard (Closes: #473)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.16
diff --git a/inc/inc.ClassSession.php b/inc/inc.ClassSession.php
index 8dcc92283..78f796a0b 100644
--- a/inc/inc.ClassSession.php
+++ b/inc/inc.ClassSession.php
@@ -294,7 +294,7 @@ class SeedDMS_Session {
 	function addToClipboard($object) { /* {{{ */
 		/* id is only set if load() was called before */
 		if($this->id) {
-			$dms = $object->_dms;
+			$dms = $object->getDMS();
 			if($object->isType('document')) {
 				if(!in_array($object->getID(), $this->data['clipboard']['docs']))
 					array_push($this->data['clipboard']['docs'], $object->getID());
@@ -317,7 +317,7 @@ class SeedDMS_Session {
 	function removeFromClipboard($object) { /* {{{ */
 		/* id is only set if load() was called before */
 		if($this->id) {
-			$dms = $object->_dms;
+			$dms = $object->getDMS();
 			if($object->isType('document')) {
 				$key = array_search($object->getID(), $this->data['clipboard']['docs']);
 				if($key !== false)
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 8126bc1a3..497e27554 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -464,7 +464,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			}
 			if($this->params['enableclipboard']) {
 				echo "   <div id=\"menu-clipboard\">";
-				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=1\"></div>";
+				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=".($folder != null ? $folder->getID() : 0)."\"></div>";
 				echo "   </div>";
 			}
 
diff --git a/views/bootstrap/class.Clipboard.php b/views/bootstrap/class.Clipboard.php
index ea595dd56..053b3df1e 100644
--- a/views/bootstrap/class.Clipboard.php
+++ b/views/bootstrap/class.Clipboard.php
@@ -65,7 +65,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
-			$content .= "    <li><a href=\"../op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['refferer'])."\">".getMLText("move_clipboard")."</a></li>\n";
+			$content .= "    <li><a href=\"../op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode('../out/out.ViewFolder.php?folderid='.$this->params['folder']->getID())."\">".getMLText("move_clipboard")."</a></li>\n";
 		}
 //		$content .= "    <li><a href=\"../op/op.ClearClipboard.php?refferer=".urlencode($this->params['refferer'])."\">".getMLText("clear_clipboard")."</a><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">kkk</a> </li>\n";
 //		$content .= "    <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n";