diff --git a/src/components/AddToList.jsx b/src/components/AddToList.jsx
new file mode 100644
index 0000000..a2f1f61
--- /dev/null
+++ b/src/components/AddToList.jsx
@@ -0,0 +1,5 @@
+import React from "react";
+
+export const AddToList = (props) => {
+  return <button className='button'>Agregar a mi lista</button>
+}
diff --git a/src/components/Entity.jsx b/src/components/Entity.jsx
index 4d88142..c357e97 100644
--- a/src/components/Entity.jsx
+++ b/src/components/Entity.jsx
@@ -1,10 +1,12 @@
 import React from "react";
-import "./Entity.scss"
+
+import "./Entity.scss";
+
+import {AddToList} from "./AddToList";
 
 export const Entity = (props) => {
   const hasCover = props.cover;
   const hasTags = props.tags && props.tags.length > 0;
-  const hasButton = props.onButtonClick || props.buttonText
 
   return (
     <div className='entity'>
@@ -20,9 +22,7 @@ export const Entity = (props) => {
             </ul>
           }
         </div>
-        {hasButton &&
-          <button className='button' onClick={props.onButtonClick}>{props.buttonText}</button>
-        }
+        <AddToList/>
       </div>
 
       {hasCover &&
diff --git a/src/views/Artist.jsx b/src/views/Artist.jsx
index 2c672ce..7c7a30d 100644
--- a/src/views/Artist.jsx
+++ b/src/views/Artist.jsx
@@ -61,8 +61,7 @@ const Artist = (props) => {
   if (artist){
     return <Entity title={artist.name}
       subtitle={[artist.type, artist.country].filter(Boolean).join(' - ')}
-      tags={artist.tags.map((tag) => (tag.name))}
-      buttonText='Agregar a mi lista'/>
+      tags={artist.tags.map((tag) => (tag.name))}/>
   }else {
     return <Fragment/>
   }
diff --git a/src/views/Disc.jsx b/src/views/Disc.jsx
index df2b0d5..444455f 100644
--- a/src/views/Disc.jsx
+++ b/src/views/Disc.jsx
@@ -68,7 +68,6 @@ const Disc = (props) => {
     )
     return <Entity title={disc.title}
       subtitle={subtitle}
-      buttonText='Agregar a mi lista'
       cover={<CoverArt disc={disc} popup={true} size={4}/>}/>
   }else {
     return <Fragment></Fragment>
diff --git a/src/views/Release.jsx b/src/views/Release.jsx
index 6c183f3..966e478 100644
--- a/src/views/Release.jsx
+++ b/src/views/Release.jsx
@@ -31,8 +31,7 @@ const Recordings = (props) => {
                       {recording.disambiguation &&
                         <div>{capitalize(recording.disambiguation)}</div>}
                     </Fragment>),
-        'selected': props.selected === recording.id,
-        'widget': <button className='button'>Agregar a mi lista</button>
+        'selected': props.selected === recording.id
       }))
     }));
 
@@ -57,7 +56,6 @@ const Release = (props) => {
     )
     return <Entity title={release.title}
       subtitle={subtitle}
-      buttonText='Agregar a mi lista'
       cover={<CoverArt release={release} popup={true} size={4}/>}/>
   }else {
     return <Fragment></Fragment>
diff --git a/src/views/Song.jsx b/src/views/Song.jsx
index 12bc6ab..ea11af8 100644
--- a/src/views/Song.jsx
+++ b/src/views/Song.jsx
@@ -23,7 +23,7 @@ const Song = (props) => {
     subtitle = <span>[{toDuration(song.length)}]</span>
   }
 
-  return <Entity title={song.title} subtitle={subtitle} buttonText='Agregar a mi lista'/>
+  return <Entity title={song.title} subtitle={subtitle}/>
 
 }