diff --git a/CHANGELOG b/CHANGELOG
index 0c5c8b9bf..3f3d3d6f6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,13 @@
 - add document list which can be exported as an archive
 - search results can be exported
 
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.2
+--------------------------------------------------------------------------------
+- do not show spinner when clipboard is loaded in menu (prevents flickering of
+  page)
+- merged changes from 5.0.12
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.1
 --------------------------------------------------------------------------------
diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 91cc4fa38..1cb012d44 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -372,7 +372,8 @@ $(document).ready( function() {
 			}
 		} else
 			url = href;
-		element.prepend('<div style="position: _absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: 200px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
+		if(!element.data('no-spinner'))
+			element.prepend('<div style="position: _absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: 200px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
 		$.get(url, function(data) {
 			element.html(data);
 //			$(".chzn-select").chosen();
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 44ed8bb43..0c3ebd130 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -403,7 +403,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 			if($this->params['enableclipboard']) {
 				echo "   <div id=\"menu-clipboard\">";
-				echo "     <div class=\"ajax\" data-view=\"Clipboard\" data-action=\"menuClipboard\"></div>";
+				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\"></div>";
 				echo "   </div>";
 			}