Index: panel-plugin/clipman.c
===================================================================
--- panel-plugin/clipman.c	(revision 6326)
+++ panel-plugin/clipman.c	(working copy)
@@ -716,12 +716,13 @@
     /* We ignore the selection clipboard entirely if you've activated this in the options dialog */
     if (!clipman->IgnoreSelect)
     {
-	/* Get mouse button information */
-	gdk_window_get_pointer(NULL, NULL, NULL, &state);
+        /* Get mouse button information */
+        gdk_window_get_pointer(NULL, NULL, NULL, &state);
 
         ptext = gtk_clipboard_wait_for_text (primaryClip);
 
-        if (clipman->PreventEmpty && ptext == NULL)
+		/* See if primary clipboard is empty - check for an image as well as text */
+        if (clipman->PreventEmpty && ptext == NULL && !gtk_clipboard_wait_is_image_available(primaryClip))
         {
             clipman_restore_empty (clipman, PRIMARY);
         }
@@ -739,8 +740,8 @@
 
     dtext = gtk_clipboard_wait_for_text (defaultClip);
 
-    /* Check default clipboard */
-    if (clipman->PreventEmpty && dtext == NULL)
+    /* See if default clipboard is empty - check for an image as well as text */
+    if (clipman->PreventEmpty && dtext == NULL && !gtk_clipboard_wait_is_image_available(defaultClip))
     {
         clipman_restore_empty (clipman, DEFAULT);
     }