diff --git a/soundboard.py b/soundboard.py
index ba6d39a..beb27be 100644
--- a/soundboard.py
+++ b/soundboard.py
@@ -20,7 +20,7 @@ def index(sound=None, text=None, video=None):
     sounds = sorted(sounds)
 
     if sound is not None and sound in sounds:
-        subprocess.Popen(["omxplayer", os.path.join(config.path, sound)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        subprocess.Popen(["omxplayer", os.path.join(config.path, sound).encode("utf-8")], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     if text is None:
     	text = request.form.get("text")
diff --git a/templates/index.html b/templates/index.html
index 56b76ab..9e7b804 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -16,7 +16,7 @@
 			<section id="sounds">
 				<div><input type="text" id="search" /><span id="reset">⨯</span></div>
 				{% for sound in sounds %}
-				<div class="sound"><a href="{{ '/play/' + sound }}">{{ sound.split('.', 1)[0] }}</a></div>
+				<div class="sound"><a href="{{ '/play/' + sound | urlencode }}">{{ sound.split('.', 1)[0] }}</a></div>
 				{% endfor %}
 			</section>
 			<section id="youtube">