diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js
index 4513d1d9d9..350b95d669 100644
--- a/src/components/subtitleeditor/subtitleeditor.js
+++ b/src/components/subtitleeditor/subtitleeditor.js
@@ -349,8 +349,8 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
 
     function onOpenUploadMenu(e) {
 
-        var context = dom.parentWithClass(e.target, 'subtitleEditorDialog');
-        var selectLanguage = context.querySelector('#selectLanguage');
+        var dialog = dom.parentWithClass(e.target, 'subtitleEditorDialog');
+        var selectLanguage = dialog.querySelector('#selectLanguage');
         var apiClient = connectionManager.getApiClient(currentItem.ServerId);
 
         require(['subtitleUploader'], function (subtitleUploader) {
@@ -368,7 +368,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
 
                 if (hasChanged) {
                     hasChanges = true;
-                    reload(context, apiClient, currentItem.Id);
+                    reload(dialog, apiClient, currentItem.Id);
                 }
             });
         });
diff --git a/src/components/subtitleuploader/subtitleuploader.js b/src/components/subtitleuploader/subtitleuploader.js
index bf3a8ca4b3..09e45ba5d4 100644
--- a/src/components/subtitleuploader/subtitleuploader.js
+++ b/src/components/subtitleuploader/subtitleuploader.js
@@ -10,19 +10,11 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
 
         loading.hide();
 
-        switch (evt.target.error.code) {
-            case evt.target.error.NOT_FOUND_ERR:
-                require(['toast'], function (toast) {
-                    toast(globalize.translate('MessageFileReadError'));
-                });
-                break;
-            case evt.target.error.ABORT_ERR:
-                break; // noop
-            default:
-                require(['toast'], function (toast) {
-                    toast(globalize.translate('MessageFileReadError'));
-                });
-                break;
+        var error = evt.target.error;
+        if (error.code !== error.ABORT_ERR) {
+            require(['toast'], function (toast) {
+                toast(globalize.translate('MessageFileReadError'));
+            });
         }
     }
 
@@ -85,7 +77,7 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
                 toast(globalize.translate('MessageSubtitleFileTypeAllowed'));
             });
             e.preventDefault();
-            return false;
+            return;
         }
 
         loading.show();
@@ -103,7 +95,6 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
         });
 
         e.preventDefault();
-        return false;
     }
 
     function initEditor(page) {
diff --git a/src/components/subtitleuploader/subtitleuploader.template.html b/src/components/subtitleuploader/subtitleuploader.template.html
index ef09775cdd..3f4944de57 100644
--- a/src/components/subtitleuploader/subtitleuploader.template.html
+++ b/src/components/subtitleuploader/subtitleuploader.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="material-icons arrow_back"></i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><em class="material-icons arrow_back"></em></button>
     <h3 class="formDialogHeaderTitle">
         ${HeaderUploadSubtitle}
     </h3>
@@ -14,7 +14,7 @@
                 <h2 style="margin:0;">${HeaderAddUpdateSubtitle}</h2>
 
                 <button is="emby-button" type="button" class="raised raised-mini btnBrowse" style="margin-left:1.5em;">
-                    <i class="material-icons">folder</i>
+                    <em class="material-icons">folder</em>
                     <span>${Browse}</span>
                 </button>
             </div>