diff --git a/events.py b/events.py
index ec963f7..dc44dd2 100644
--- a/events.py
+++ b/events.py
@@ -55,6 +55,8 @@ async def select_track(request, ws, data):
 	fpath = fpath.replace('flac', 'opus')
 	fpath = parse.quote(fpath)
 	track['url'] = fpath
+	coverart = parse.urljoin(fpath, 'folder.jpg')
+	track['coverart'] = coverart
 	ret = {'event': 'track', 'ok': True, 'data': track}
 	await ws.send_json(ret)
 
@@ -68,9 +70,11 @@ async def random_track(request, ws, data):
 	fpath = track.pop('filepath')
 	track.pop('last_modified')
 	fpath = config.static_prefix + os.path.relpath(fpath, config.music_dir)
-	fpath = fpath.replace('flac', 'opus')
+	fpath = fpath.replace('.flac', '.opus')
 	fpath = parse.quote(fpath)
 	track['url'] = fpath
+	coverart = parse.urljoin(fpath, 'folder.jpg')
+	track['coverart'] = coverart
 	ret = {'event': 'track', 'ok': True, 'data': track}
 	await ws.send_json(ret)
 
diff --git a/static/scorch.css b/static/scorch.css
index 67fae94..7caacad 100644
--- a/static/scorch.css
+++ b/static/scorch.css
@@ -6,6 +6,10 @@ body {
 	box-sizing: border-box;
 }
 
+img {
+	max-height: 100%;
+}
+
 main {
 	height: 100%;
 	display: grid;
diff --git a/static/scorch.js b/static/scorch.js
index d84ddc6..a18ecbc 100644
--- a/static/scorch.js
+++ b/static/scorch.js
@@ -122,6 +122,7 @@ function track_recv(data) {
 	player.firstElementChild.src = data['url'];
 	player.load();
 	player.play();
+	document.querySelector('#albumCover').firstChild.src = data['coverart'];
 }
 
 /* Websocket send */