diff --git a/picard/const.py b/picard/const.py
index 00a7dacc2..efd9bc1e4 100644
--- a/picard/const.py
+++ b/picard/const.py
@@ -48,11 +48,11 @@ CAA_PORT = 80
 
 # URLs
 PICARD_URLS = {
-    'documentation':    "http://musicbrainz.org/doc/Picard_Documentation",
-    'troubleshooting':  "http://musicbrainz.org/doc/Picard_Troubleshooting",
+    'documentation':    "http://musicbrainz.org/doc/MusicBrainz_Picard/Documentation",
+    'troubleshooting':  "http://musicbrainz.org/doc/MusicBrainz_Picard/Troubleshooting",
     'home':             "http://musicbrainz.org/doc/MusicBrainz_Picard",
-    'doc_options':      "http://musicbrainz.org/doc/Picard_Documentation/Options",
-    'plugins':          "http://musicbrainz.org/doc/Picard_Plugins",
+    'doc_options':      "http://musicbrainz.org/doc/MusicBrainz_Picard/Documentation/Options",
+    'plugins':          "http://musicbrainz.org/doc/MusicBrainz_Picard/Plugins",
     'forum':            "http://forums.musicbrainz.org/viewforum.php?id=2",
     'donate':           "http://metabrainz.org/donate",
     'chromaprint':      "http://acoustid.org/chromaprint#download",
diff --git a/picard/ui/coverartbox.py b/picard/ui/coverartbox.py
index 7d98eba34..475fbb905 100644
--- a/picard/ui/coverartbox.py
+++ b/picard/ui/coverartbox.py
@@ -38,7 +38,7 @@ class ActiveLabel(QtGui.QLabel):
         QtGui.QLabel.__init__(self, *args)
         self.setMargin(0)
         self.setActive(active)
-        self.setAcceptDrops(True)
+        self.setAcceptDrops(False)
 
     def setActive(self, active):
         self.active = active
@@ -52,8 +52,10 @@ class ActiveLabel(QtGui.QLabel):
             self.clicked.emit()
 
     def dragEnterEvent(self, event):
-        if event.mimeData().hasUrls():
-            event.acceptProposedAction()
+        for url in event.mimeData().urls():
+            if url.scheme() in ('http', 'file'):
+                event.acceptProposedAction()
+                break
 
     def dropEvent(self, event):
         accepted = False
@@ -128,6 +130,10 @@ class CoverArtBox(QtGui.QGroupBox):
                 # There's no front image, choose the first one available
                 data = metadata.images[0]
         self.__set_data(data)
+        if item and metadata:
+            self.coverArt.setAcceptDrops(True)
+        else:
+            self.coverArt.setAcceptDrops(False)
         release = None
         if metadata:
             release = metadata.get("musicbrainz_albumid", None)