diff --git a/src/lib/EntryView.cpp b/src/lib/EntryView.cpp
index f7d9fc4..61b39bb 100644
--- a/src/lib/EntryView.cpp
+++ b/src/lib/EntryView.cpp
@@ -58,6 +58,10 @@ KeepassEntryView::KeepassEntryView(QWidget* parent) : QTreeWidget(parent) {
 
 KeepassEntryView::~KeepassEntryView(){
 	saveHeaderView();
+	if (ClipboardTimer.isActive()) {
+		ClipboardTimer.stop();
+		OnClipboardTimeOut();
+	}
 }
 
 void KeepassEntryView::retranslateColumns() {