diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbc81747..48fe2653 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
* CHANGED: Upgrading libraries to: identicon 2.0.0
* FIXED: Support custom expiration options in email function (#586)
* FIXED: Regression with encoding of HTML entities (#588)
+ * FIXED: Unable to paste password on paste with attachment (#565 & #595)
* **1.3.3 (2020-02-16)**
* CHANGED: Upgrading libraries to: DOMpurify 2.0.8
* CHANGED: Several translations got updated with missing messages
diff --git a/js/privatebin.js b/js/privatebin.js
index c6b98b9b..974b4c54 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -3447,6 +3447,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
if (fadeOut === true) {
setTimeout(function () {
$comment.removeClass('highlight');
+
}, 300);
}
};
@@ -4249,7 +4250,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
*/
me.isAttachmentReadonly = function()
{
- return $attach.hasClass('hidden');
+ return createButtonsDisplayed && $attach.hasClass('hidden');
}
/**
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index e9853f22..39d50493 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -72,7 +72,7 @@ endif;
?>
-
+
diff --git a/tpl/page.php b/tpl/page.php
index f54170e1..7500ecae 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -50,7 +50,7 @@ endif;
?>
-
+