diff --git a/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/ClipboardHistory.java b/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/ClipboardHistory.java
--- a/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/ClipboardHistory.java
+++ b/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/ClipboardHistory.java
@@ -91,7 +91,7 @@
         }
     }
 
-    private void addHistory(Transferable transferable, String text) {
+    void addHistory(Transferable transferable, String text) {
         if (transferable == null || text == null || text.length() > MAX_ITEM_LENGTH) {
             return;
         }
diff --git a/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/CompletionLayoutPopup.java b/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/CompletionLayoutPopup.java
--- a/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/CompletionLayoutPopup.java
+++ b/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/CompletionLayoutPopup.java
@@ -649,6 +649,7 @@
             clipboard.setContents(contents, layout.getSelectedValue());
         }
         getEditorComponent().paste();
+        ClipboardHistory.getInstance().addHistory(layout.getSelectedValue().getTransferable(), layout.getSelectedValue().getFullText());
     }
 
     static class FullTextPopup extends CompletionLayoutPopup {