diff --git a/package.json b/package.json
index 10196c0186ded5c23321fd9254b9d1f21ec9edc6..53740d574f7c1a1b0d0a0a05c4519c53b29f8118 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "react-draggable": "3.0.4",
     "react-intl": "2.4.0",
     "react-intl-redux": "0.6.0",
-    "react-modal": "3.1.7",
+    "react-modal": "3.1.8",
     "react-redux": "5.0.6",
     "react-responsive": "4.0.3",
     "react-style-proptype": "3.1.0",
diff --git a/src/components/gui/gui.css b/src/components/gui/gui.css
index 2de5a096937550a04fdd967becedfbabe2a36fe8..3d08cadf626c339dcdc33b3b1aa029c487078955 100644
--- a/src/components/gui/gui.css
+++ b/src/components/gui/gui.css
@@ -68,6 +68,8 @@
     display: flex;
     justify-content: center;
     align-items: center;
+
+    user-select: none;
 }
 
 .tab.is-selected {
diff --git a/src/containers/sound-tab.jsx b/src/containers/sound-tab.jsx
index 6143175ddace4a3755d81c743bc8c81192cd23ad..d61bea13147db30196964f33b1066df3e7ac39cf 100644
--- a/src/containers/sound-tab.jsx
+++ b/src/containers/sound-tab.jsx
@@ -104,7 +104,7 @@ class SoundTab extends React.Component {
                 onDeleteClick={this.handleDeleteSound}
                 onItemClick={this.handleSelectSound}
             >
-                {sprite.sounds && sprite.sounds.length > 0 ? (
+                {sprite.sounds && sprite.sounds[this.state.selectedSoundIndex] ? (
                     <SoundEditor soundIndex={this.state.selectedSoundIndex} />
                 ) : null}
                 {this.props.soundRecorderVisible ? (
diff --git a/src/lib/libraries/costumes.json b/src/lib/libraries/costumes.json
index 793da7de2e38efbbff5e541ad6b8c1f5ca4bcc08..3a25f80514b520a8c0af5107ec5183080ca32aa9 100644
--- a/src/lib/libraries/costumes.json
+++ b/src/lib/libraries/costumes.json
@@ -780,6 +780,17 @@
             1
         ]
     },
+    {
+        "name": "Empty",
+        "md5": "cd21514d0531fdffb22204e0ec5ed84a.svg",
+        "type": "costume",
+        "tags": [],
+        "info": [
+            0,
+            0,
+            1
+        ]
+    },
     {
         "name": "Fish1",
         "md5": "df78f8195f72372846d96dc70cb0ad95.svg",
diff --git a/src/lib/libraries/sprites.json b/src/lib/libraries/sprites.json
index 13f8d3bc8c706564c9c2131f8342f7b31af28abd..71029700450f89ed76793e41a68efa37e788b8b2 100644
--- a/src/lib/libraries/sprites.json
+++ b/src/lib/libraries/sprites.json
@@ -1731,6 +1731,50 @@
             "spriteInfo": {}
         }
     },
+    {
+        "name": "Empty",
+        "md5": "cd21514d0531fdffb22204e0ec5ed84a.svg",
+        "type": "sprite",
+        "tags": [],
+        "info": [
+            0,
+            1,
+            1
+        ],
+        "json": {
+            "objName": "Empty",
+            "sounds": [
+                {
+                    "soundName": "pop",
+                    "soundID": -1,
+                    "md5": "83a9787d4cb6f3b7632b4ddfebf74367.wav",
+                    "sampleCount": 258,
+                    "rate": 11025,
+                    "format": ""
+                }
+            ],
+            "costumes": [
+                {
+                    "costumeName": "empty",
+                    "baseLayerID": 0,
+                    "baseLayerMD5": "cd21514d0531fdffb22204e0ec5ed84a.svg",
+                    "bitmapResolution": 1,
+                    "rotationCenterX": 0,
+                    "rotationCenterY": 0
+                }
+            ],
+            "currentCostumeIndex": 0,
+            "scratchX": 36,
+            "scratchY": 28,
+            "scale": 1,
+            "direction": 90,
+            "rotationStyle": "normal",
+            "isDraggable": false,
+            "indexInLibrary": 68,
+            "visible": true,
+            "spriteInfo": {}
+        }
+    },
     {
         "name": "Fish1",
         "md5": "df78f8195f72372846d96dc70cb0ad95.svg",