diff --git a/src/renderer/index.js b/src/renderer/index.js
index ca2c51dd..ee23936f 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -3285,6 +3285,14 @@ const app = new Vue({
                 this.cfg.visual.showuserinfo = false
                 this.chrome.hideUserInfo = true
             }
+        },
+        isElementOverflowing(selector) {
+            try{
+            let element = document.querySelector(selector);
+            var overflowX = element.offsetWidth < element.scrollWidth,
+              overflowY = element.offsetHeight < element.scrollHeight;
+          
+            return (overflowX || overflowY); } catch (e) { return false}
         }
 
     }
diff --git a/src/renderer/style.less b/src/renderer/style.less
index aa57d762..c6cb735f 100644
--- a/src/renderer/style.less
+++ b/src/renderer/style.less
@@ -1048,7 +1048,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
   font-size: 13px;
   height: 1.3em;
   line-height: 1.3em;
-  overflow: hidden;
+  white-space: nowrap;
   max-width: 360px;
 
   .song-name-normal {
@@ -1080,16 +1080,44 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
   margin: 0 0 0 0.25em;
 }
 
+.app-playback-controls:hover .marquee{
+  animation: unset; 
+  &.song-artist{
+    overflow: hidden;
+  }
+  .song-artist{
+    overflow: hidden;
+  }
+  &.song-name{
+    overflow: hidden;
+  }
+}
+
+
+.marquee{
+  animation: marquee 15s linear infinite; 
+  &.song-artist{
+    overflow: unset ;
+  }
+  .song-artist{
+    overflow: unset ;
+  }
+  &.song-name{
+    overflow: unset ;
+  }
+}
+
+
 .app-chrome .app-chrome-item > .app-playback-controls .song-artist {
   font-weight: 400;
   font-size: 12px;
   text-align: center;
   /*height: 1.2em;
   line-height: 1.2em;*/
-  overflow: hidden;
+
   z-index: 1;
   max-width: 360px;
-  /* animation: marquee 10s linear infinite; */
+  
 
   .song-artist-normal {
     height: inherit;
@@ -1221,6 +1249,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
   align-items: center;
   flex-direction: column;
   position: relative;
+  overflow: hidden;
 }
 
 .app-chrome .app-chrome-item > .app-playback-controls .playback-info > div {
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index c12f56af..61bf2118 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -83,13 +83,14 @@
                                 </div>
                                 <div class="playback-info">
                                     <div class="song-name" style="-webkit-box-orient: horizontal;"
+                                    :class="[isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') ? 'marquee' : '']"
                                          :style="[mk.nowPlayingItem['attributes']['contentRating'] == 'explicit' ? {'margin-left' : '23px'} : {'margin-left' : '0px'} ]">
                                         {{ mk.nowPlayingItem["attributes"]["name"] }}
                                         <div class="explicit-icon"
                                              v-if="mk.nowPlayingItem['attributes']['contentRating'] == 'explicit'"
                                              style="display: inline-block"></div>
                                     </div>
-                                    <div class="song-artist"
+                                    <div class="song-artist" :class="[isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-artist') ? 'marquee' : '']"
                                          style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap;">
                                         <div class="item-navigate song-artist" style="display: inline-block"
                                              @click="getNowPlayingItemDetailed(`artist`)">