diff --git a/ankiqt/ui/cardlist.py b/ankiqt/ui/cardlist.py
index 12d9a62d6..267c8126b 100644
--- a/ankiqt/ui/cardlist.py
+++ b/ankiqt/ui/cardlist.py
@@ -235,6 +235,7 @@ class EditDeck(QMainWindow):
                      self.tagChanged)
 
     def setupSort(self):
+        self.dialog.sortBox.setMaxVisibleItems(30)
         self.sortIndex = self.config['sortIndex']
         self.drawSort()
         self.connect(self.dialog.sortBox, SIGNAL("activated(int)"),
@@ -242,6 +243,7 @@ class EditDeck(QMainWindow):
         self.sortChanged(self.sortIndex, refresh=False)
 
     def drawTags(self):
+        self.dialog.tagList.setMaxVisibleItems(30)
         tags = self.deck.allTags()
         self.alltags = tags
         self.alltags.sort()
diff --git a/ankiqt/ui/facteditor.py b/ankiqt/ui/facteditor.py
index f55b76d49..fa9b91005 100644
--- a/ankiqt/ui/facteditor.py
+++ b/ankiqt/ui/facteditor.py
@@ -4,7 +4,7 @@
 
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
-import re, os, sys
+import re, os, sys, tempfile
 from anki.utils import stripHTML, tidyHTML, canonifyTags
 from anki.sound import playFromText
 import anki.sound
@@ -540,6 +540,10 @@ class FactEditor(object):
         file = ui.utils.getFile(self.parent, _("Add an image"), "picture", key)
         if not file:
             return
+        self._addPicture(file)
+
+    def _addPicture(self, file):
+        w = self.focusedEdit()
         path = self.deck.addMedia(file)
         w.insertHtml('<img src="%s">' % path)
 
@@ -562,7 +566,12 @@ class FactEdit(QTextEdit):
         self.parent = parent
 
     def insertFromMimeData(self, source):
-        if source.hasText():
+        if source.hasImage():
+            im = QImage(source.imageData())
+            (fd, name) = tempfile.mkstemp(suffix=".jpg")
+            im.save(name, None, 95)
+            self.parent._addPicture(name)
+        elif source.hasText():
             self.insertPlainText(source.text())
         elif source.hasHtml():
             self.insertHtml(self.simplyHTML(unicode(source.html())))