diff --git a/.editorconfig b/.editorconfig
index 322ae485..36af2daa 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,5 +16,5 @@ max_line_length = 100
 [*.md]
 trim_trailing_whitespace = false
 
-[{layouts/shortcodes/*.html, layouts/_default/_markup/*.html}]
+[{*/layouts/shortcodes/*.html, */layouts/_default/_markup/*.html}]
 insert_final_newline = false
diff --git a/wowchemy/layouts/shortcodes/audio.html b/wowchemy/layouts/shortcodes/audio.html
index 322e976b..f50a1336 100644
--- a/wowchemy/layouts/shortcodes/audio.html
+++ b/wowchemy/layouts/shortcodes/audio.html
@@ -19,8 +19,8 @@
   {{ $audio = $audio | relURL }}
 {{ end }}
 
-{{ with $audio }}
-  <audio controls>
-    <source src="{{ . }}" type="audio/{{$audio_type}}">
+{{ if $audio }}
+  <audio controls {{ with (.Get "id") }}id="audio-{{.|urlize}}"{{end}}>
+    <source src="{{$audio}}" type="audio/{{$audio_type}}">
   </audio>
-{{ end }}
\ No newline at end of file
+{{ end }}