diff --git a/winamp.css b/winamp.css
index b55e74c6..66174123 100755
--- a/winamp.css
+++ b/winamp.css
@@ -20,6 +20,8 @@ a:focus { outline: none; }
     cursor:url('cursors/MAINMENU.CUR'), auto;
 }
 
+#winamp.closed { display: none; }
+
 #title-bar {
     position: absolute;
     top: 0;
diff --git a/winamp.js b/winamp.js
index 4f5c27a7..01f54996 100755
--- a/winamp.js
+++ b/winamp.js
@@ -170,6 +170,9 @@ function Winamp () {
     }
 
     this.nodes.close.onclick = function() {
+        self.media.stop();
+        self.setStatus('stop'); // Currently unneeded
+        self.nodes.winamp.classList.add('closed');
     }
 
     this.media.addEventListener('timeupdate', function() {