diff --git a/.eslintrc.js b/.eslintrc.js
index 4a3fec9448..8b9a7dea13 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -42,7 +42,8 @@ module.exports = {
         'one-var': ["error", "never"],
         'quotes': ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": false }],
         'semi': ["error"],
-        'space-before-blocks': ["error"]
+        'space-before-blocks': ["error"],
+        "space-infix-ops": "error"
     },
     overrides: [
         {
diff --git a/src/components/indicators/indicators.js b/src/components/indicators/indicators.js
index 7bc8ddd4ec..604f480f1d 100644
--- a/src/components/indicators/indicators.js
+++ b/src/components/indicators/indicators.js
@@ -148,7 +148,7 @@ export function getTypeIndicator(item) {
     };
 
     const icon = iconT[item.Type];
-    return icon ? '<div class="indicator videoIndicator"><span class="material-icons indicatorIcon '+ icon +'"></span></div>' : '';
+    return icon ? '<div class="indicator videoIndicator"><span class="material-icons indicatorIcon ' + icon + '"></span></div>' : '';
 }
 
 export function getMissingIndicator(item) {
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index a4f25a774c..089915a834 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -140,7 +140,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 }
                 if (item.SeriesName != null) {
                     var seriesName = item.SeriesName;
-                    if (item.SeriesId !=null) {
+                    if (item.SeriesId != null) {
                         context.querySelector('.nowPlayingSerie').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="itemdetails.html?id=' + item.SeriesId + `&amp;serverId=${nowPlayingServerId}">${seriesName}</a>`;
                     } else {
                         context.querySelector('.nowPlayingSerie').innerHTML = seriesName;
diff --git a/src/components/scrollManager.js b/src/components/scrollManager.js
index f7bd41ff8b..3b01cf1ad1 100644
--- a/src/components/scrollManager.js
+++ b/src/components/scrollManager.js
@@ -92,7 +92,7 @@ import layoutManager from 'layoutManager';
      * @return {number} Eased value in range [0, 1].
      */
     function ease(t) {
-        return t*(2 - t); // easeOutQuad === ease-out
+        return t * (2 - t); // easeOutQuad === ease-out
     }
 
     /**
@@ -402,8 +402,8 @@ import layoutManager from 'layoutManager';
 
             k = ease(k);
 
-            const x = ox + dx*k;
-            const y = oy + dy*k;
+            const x = ox + dx * k;
+            const y = oy + dy * k;
 
             builtinScroll(xScroller, x, yScroller, y, false);
 
diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js
index 45342208ea..d9eab0ac4d 100644
--- a/src/controllers/itemdetailpage.js
+++ b/src/controllers/itemdetailpage.js
@@ -803,9 +803,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         }
 
         if (editable && url === undefined) {
-            html += "<a class='itemDetailGalleryLink itemDetailImage defaultCardBackground defaultCardBackground"+ cardBuilder.getDefaultBackgroundClass(item.Name) + "' is='emby-linkbutton' style='display:block;margin:0;padding:0;' href='#'>";
+            html += "<a class='itemDetailGalleryLink itemDetailImage defaultCardBackground defaultCardBackground" + cardBuilder.getDefaultBackgroundClass(item.Name) + "' is='emby-linkbutton' style='display:block;margin:0;padding:0;' href='#'>";
         } else if (!editable && url === undefined) {
-            html += "<div class='itemDetailGalleryLink itemDetailImage defaultCardBackground defaultCardBackground"+ cardBuilder.getDefaultBackgroundClass(item.Name) + "' is='emby-linkbutton' style='display:block;margin:0;padding:0;' href='#'>";
+            html += "<div class='itemDetailGalleryLink itemDetailImage defaultCardBackground defaultCardBackground" + cardBuilder.getDefaultBackgroundClass(item.Name) + "' is='emby-linkbutton' style='display:block;margin:0;padding:0;' href='#'>";
         } else if (editable) {
             html += "<a class='itemDetailGalleryLink' is='emby-linkbutton' style='display:block;margin:0;padding:0;' href='#'>";
         }