diff --git a/package.json b/package.json
index 78f231d311..90f901e8ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Kitematic",
-  "version": "0.10.4",
+  "version": "0.11.0",
   "author": "Kitematic",
   "description": "Simple Docker Container management for Mac OS X.",
   "homepage": "https://kitematic.com/",
diff --git a/src/components/ImageCard.react.js b/src/components/ImageCard.react.js
index 2816757695..0115f7671c 100644
--- a/src/components/ImageCard.react.js
+++ b/src/components/ImageCard.react.js
@@ -119,7 +119,7 @@ var ImageCard = React.createClass({
     var description;
     if (this.props.image.description) {
       description = this.props.image.description;
-    } else if(this.props.image.short_description){
+    } else if (this.props.image.short_description) {
       description = this.props.image.short_description;
     } else {
       description = 'No description.';
diff --git a/src/components/NewContainerSearch.react.js b/src/components/NewContainerSearch.react.js
index 886ad17817..fac25935b4 100644
--- a/src/components/NewContainerSearch.react.js
+++ b/src/components/NewContainerSearch.react.js
@@ -240,7 +240,7 @@ module.exports = React.createClass({
       );
       paginateResults = null;
     } else if (filter === 'userimages') {
-      let userImageItems = this.state.images.map(image => {
+      let userImageItems = this.state.images.map((image, index) => {
         let repo = image.RepoTags[0].split(':')[0];
         if (repo.indexOf('/') === -1) {
           repo = 'local/' + repo;
@@ -250,7 +250,10 @@ module.exports = React.createClass({
         let tags = image.tags.join('-');
         image.star_count = 0;
         image.is_local = true;
-        return (<ImageCard key={image.namespace + '/' + image.name + ':' + tags} image={image} chosenTag={image.tags[0]} tags={image.tags} />);
+        console.log('Img: %o', image);
+        const key = `local-${image.name}-${index}`;
+        console.log('User img key: %o', key);
+        return (<ImageCard key={key + ':' + tags} image={image} chosenTag={image.tags[0]} tags={image.tags} />);
       });
       let userImageResults = userImageItems.length ? (
         <div className="result-grids">
@@ -277,8 +280,16 @@ module.exports = React.createClass({
         </div>
       );
     } else if (repos.length) {
-      let recommendedItems = repos.filter(repo => repo.is_recommended).map(image => <ImageCard key={image.namespace + '/' + image.name} image={image} />);
-      let otherItems = repos.filter(repo => !repo.is_recommended && !repo.is_user_repo).map(image => <ImageCard key={image.namespace + '/' + image.name} image={image} />);
+      let recommendedItems = repos.filter(repo => repo.is_recommended).map((image, index) => {
+        const key = `rec-${image.name}-${index}`;
+        console.log('Rec img key: %o', key);
+        return (<ImageCard key={key} image={image} />);
+      });
+      let otherItems = repos.filter(repo => !repo.is_recommended && !repo.is_user_repo).map((image, index) => {
+        const key = `other-${image.name}-${index}`;
+        console.log('Other img key: %o', key);
+        return (<ImageCard key={key} image={image} />);
+      });
 
       let recommendedResults = recommendedItems.length ? (
         <div>
@@ -289,7 +300,11 @@ module.exports = React.createClass({
         </div>
       ) : null;
 
-      let userRepoItems = repos.filter(repo => repo.is_user_repo).map(image => <ImageCard key={image.namespace + '/' + image.name} image={image} />);
+      let userRepoItems = repos.filter(repo => repo.is_user_repo).map((image, index) => {
+        const key = `usr-${image.name}-${index}`;
+        console.log('User img key: %o', key);
+        return (<ImageCard key={key} image={image} />);
+      });
       let userRepoResults = userRepoItems.length ? (
         <div>
           <h4>My Repositories</h4>