diff --git a/gameview.py b/gameview.py
index 7eaba38..69f0b56 100644
--- a/gameview.py
+++ b/gameview.py
@@ -1888,7 +1888,7 @@ class GUI(QtGui.QWidget):
     def onMusicItemDoubleClicked(self, item):
         self.pickedMusicItem = True
         if self.privateMusicSelected:
-            self.sendOOCchat(self.OOCNameInput.text().toUtf8(), "/play " + self.musicListPrivate[item.text()])
+            self.sendOOCchat(self.OOCNameInput.text().toUtf8(), "/play " + encodeAOString(self.musicListPrivate[item.text()]))
         else:
             self.sendMC(self.musicList[item.text()])
         
@@ -3900,7 +3900,7 @@ class GUI(QtGui.QWidget):
                     self.specialStream = True
                 if (musl.startswith("https") and error == 2) or self.specialStream:
                     print "[audio] Downloading music with urllib2"
-                    self.downloadThread = MusicDownloadThread(self, mus)
+                    self.downloadThread = MusicDownloadThread(self, mus.replace(" ", "%20"))
                     self.downloadThread.finished_signal.connect(self.playDownloadedMusic)
                     self.downloadThread.start()