diff --git a/src/ScratchPad.py b/src/ScratchPad.py
index 002dea49a..fb4827318 100644
--- a/src/ScratchPad.py
+++ b/src/ScratchPad.py
@@ -87,6 +87,7 @@ for (name, file) in (
     ('name', 'geo-show-person.png'),
     ('repository', 'gramps-repository.png'),
     ('source', 'gramps-source.png'),
+    ('citation', 'gramps-citation.png'),
     ('text', 'gramps-font.png'),
     ('url', 'gramps-geo.png'),
     ):
@@ -104,7 +105,7 @@ def map2class(target):
          'personref': ScratchPersonRef,
          'childref': ScratchChildRef,
          'source-link': ScratchSourceLink,
-         'srcref': ScratchSourceRef,
+         'citation-link': ScratchCitation,
          'repo-link': ScratchRepositoryLink,
          'pevent': ScratchEvent,
          'eventref': ScratchEventRef,
@@ -119,6 +120,7 @@ def obj2class(target):
     d= {"Person": ScratchPersonLink,
         "Family": ScratchFamilyLink,
         'Source': ScratchSourceLink,
+        'Citation': ScratchCitation,
         'Repository': ScratchRepositoryLink,
         'Event': ScratchEvent,
         'Media': ScratchMediaObj,
@@ -131,6 +133,7 @@ def obj2target(target):
     d = {"Person": 'person-link',
          "Family": 'family-link',
          'Source': 'source-link',
+         'Citation': 'citation-link',
          'Repository': 'repo-link',
          'Event': 'pevent',
          'Media': 'mediaobj',
@@ -437,24 +440,25 @@ class ScratchFamilyAttribute(ScratchObjWrapper):
             self._title = str(self._obj.get_type())
             self._value = self._obj.get_value()
 
-class ScratchSourceRef(ScratchObjWrapper):
+class ScratchCitation(ScratchHandleWrapper):
 
-    DROP_TARGETS = [DdTargets.SOURCEREF]
-    DRAG_TARGET  = DdTargets.SOURCEREF
-    ICON         = LINK_PIC
+    DROP_TARGETS = [DdTargets.CITATION_LINK]
+    DRAG_TARGET  = DdTargets.CITATION_LINK
+    ICON         = ICONS["citation"]
 
     def __init__(self, dbstate, obj):
-        super(ScratchSourceRef, self).__init__(dbstate, obj)
-        self._type  = _("Source ref")
-        if self._obj:
-            base = self._db.get_source_from_handle(self._obj.get_reference_handle())
-            if base:
-                self._title = base.get_title()
+        super(ScratchCitation, self).__init__(dbstate, obj)
+        self._type  = _("Citation")
+        self._objclass = 'Citation'
+        if self._handle:
+            citation = self._db.get_citation_from_handle(self._handle)
+            if citation:
+                self._title = citation.get_gramps_id()
                 notelist = map(self._db.get_note_from_handle, 
-                               self._obj.get_note_list())
+                               citation.get_note_list())
                 srctxtlist = [note for note in notelist 
-                               if note.get_type() == gen.lib.NoteType.SOURCE_TEXT]
-                page = self._obj.get_page()
+                        if note.get_type() == gen.lib.NoteType.SOURCE_TEXT]
+                page = citation.get_page()
                 if not page:
                     page = _('not available|NA')
                 text = ""
@@ -470,6 +474,14 @@ class ScratchSourceRef(ScratchObjWrapper):
                                     'sourcetext' : text,
                                     }
 
+    def is_valid(self):
+        data = pickle.loads(self._obj)
+        handle = data[2]
+        obj = self._db.get_citation_from_handle(handle)
+        if obj:
+            return True
+        return False
+
 class ScratchRepoRef(ScratchObjWrapper):
 
     DROP_TARGETS = [DdTargets.REPOREF]
@@ -968,7 +980,6 @@ class ScratchPadListView(object):
         self.register_wrapper_class(ScratchEvent)
         self.register_wrapper_class(ScratchPlace)
         self.register_wrapper_class(ScratchEventRef)
-        self.register_wrapper_class(ScratchSourceRef)
         self.register_wrapper_class(ScratchRepoRef)
         self.register_wrapper_class(ScratchFamilyEvent)
         self.register_wrapper_class(ScratchUrl)
@@ -979,6 +990,7 @@ class ScratchPadListView(object):
         self.register_wrapper_class(ScratchMediaObj)
         self.register_wrapper_class(ScratchMediaRef)
         self.register_wrapper_class(ScratchSourceLink)
+        self.register_wrapper_class(ScratchCitation)
         self.register_wrapper_class(ScratchPersonLink)
         self.register_wrapper_class(ScratchFamilyLink)
         self.register_wrapper_class(ScratchDropList)
diff --git a/src/gui/editors/displaytabs/citationembedlist.py b/src/gui/editors/displaytabs/citationembedlist.py
index 1243d18d1..899de726d 100644
--- a/src/gui/editors/displaytabs/citationembedlist.py
+++ b/src/gui/editors/displaytabs/citationembedlist.py
@@ -63,7 +63,7 @@ class CitationEmbedList(EmbeddedList, DbGUIElement):
     """
 
     _HANDLE_COL = 4  # Column number from CitationRefModel
-    _DND_TYPE = DdTargets.NOTE_LINK
+    _DND_TYPE = DdTargets.CITATION_LINK
 
     _MSG = {
         'add'   : _('Create and add a new citation and new source'),
diff --git a/src/plugins/view/citationtreeview.py b/src/plugins/view/citationtreeview.py
index 04dda78ba..ee4fc637d 100644
--- a/src/plugins/view/citationtreeview.py
+++ b/src/plugins/view/citationtreeview.py
@@ -196,7 +196,20 @@ class CitationTreeView(ListView):
         return self.dbstate.db.get_citation_bookmarks()
 
     def drag_info(self):
-        return DdTargets.SOURCE_LINK
+        selection = self.selected_handles()
+        if len(selection) == 1:
+            handle = selection[0]
+            # The handle will either be a Source handle or a Citation handle
+            source = self.dbstate.db.get_source_from_handle(handle)
+            citation = self.dbstate.db.get_citation_from_handle(handle)
+            if (not source and not citation) or (source and citation):
+                raise ValueError("selection must be either source or citation")
+            if source:
+                return DdTargets.SOURCE_LINK
+            else:
+                return DdTargets.CITATION_LINK
+        else:
+            return DdTargets.CITATION_LINK
     
     def type_list(self):
         """