diff --git a/src/components/playlist/PlaylistView.tsx b/src/components/playlist/PlaylistView.tsx
index 65157af..c7ba771 100644
--- a/src/components/playlist/PlaylistView.tsx
+++ b/src/components/playlist/PlaylistView.tsx
@@ -302,7 +302,7 @@ const PlaylistView = ({ ...rest }) => {
                   whiteSpace: 'nowrap',
                 }}
               >
-                {data.comment ? data.comment : ' '}
+                {data.comment ? data.comment : <span>&#8203;</span>}
               </div>
               <div style={{ marginTop: '10px' }}>
                 <ButtonToolbar>
@@ -310,11 +310,13 @@ const PlaylistView = ({ ...rest }) => {
                     appearance="primary"
                     size="lg"
                     onClick={handlePlay}
+                    disabled={localPlaylistData.length < 1}
                   />
                   <PlayAppendButton
                     appearance="primary"
                     size="lg"
                     onClick={handlePlayAppend}
+                    disabled={localPlaylistData.length < 1}
                   />
                   <SaveButton
                     size="lg"
diff --git a/src/components/shared/ToolbarButtons.tsx b/src/components/shared/ToolbarButtons.tsx
index bb185a1..938c035 100644
--- a/src/components/shared/ToolbarButtons.tsx
+++ b/src/components/shared/ToolbarButtons.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Icon } from 'rsuite';
 import CustomTooltip from './CustomTooltip';
-import { StyledButton, StyledIconButton } from './styled';
+import { StyledIconButton } from './styled';
 
 export const PlayButton = ({ ...rest }) => {
   return (