diff --git a/src/gui/Clipboard.cpp b/src/gui/Clipboard.cpp
index eb77d2b3d..7d8f71faf 100644
--- a/src/gui/Clipboard.cpp
+++ b/src/gui/Clipboard.cpp
@@ -51,6 +51,7 @@ void Clipboard::setText(const QString& text)
     if (config()->get("security/clearclipboard").toBool()) {
         int timeout = config()->get("security/clearclipboardtimeout").toInt();
         if (timeout > 0) {
+            m_lastCopied = text;
             m_timer->start(timeout * 1000);
         }
     }
@@ -65,8 +66,12 @@ void Clipboard::clearClipboard()
         return;
     }
 
-    clipboard->clear(QClipboard::Clipboard);
-    if (clipboard->supportsSelection()) {
+    if (clipboard->text(QClipboard::Clipboard) == m_lastCopied) {
+        clipboard->clear(QClipboard::Clipboard);
+    }
+
+    if (clipboard->supportsSelection()
+            && (clipboard->text(QClipboard::Selection) == m_lastCopied)) {
         clipboard->clear(QClipboard::Selection);
     }
 
@@ -74,6 +79,8 @@ void Clipboard::clearClipboard()
     QDBusMessage message = QDBusMessage::createMethodCall("org.kde.klipper", "/klipper", "", "clearClipboardHistory");
     QDBusConnection::sessionBus().send(message);
 #endif
+
+    m_lastCopied.clear();
 }
 
 void Clipboard::cleanup()
diff --git a/src/gui/Clipboard.h b/src/gui/Clipboard.h
index bc2a19d31..8b6ea69f5 100644
--- a/src/gui/Clipboard.h
+++ b/src/gui/Clipboard.h
@@ -43,6 +43,7 @@ private:
     static Clipboard* m_instance;
 
     QTimer* m_timer;
+    QString m_lastCopied;
 };
 
 inline Clipboard* clipboard() {