diff --git a/modules/gui/skins2/commands/cmd_quit.cpp b/modules/gui/skins2/commands/cmd_quit.cpp
index 94f82da698831cfdd8a20212bdd6f49ada9a4b27..74cd7ed8a739e5600077861aaee19cb314a9e9e4 100644
--- a/modules/gui/skins2/commands/cmd_quit.cpp
+++ b/modules/gui/skins2/commands/cmd_quit.cpp
@@ -22,6 +22,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#   include "config.h"
+#endif
+
+#include <vlc_osd.h>
+#include <vlc_playlist.h>
+
 #include "cmd_quit.hpp"
 #include "../src/os_factory.hpp"
 #include "../src/os_loop.hpp"
@@ -29,9 +36,16 @@
 
 void CmdQuit::execute()
 {
+    // Stop the playlist
+    vout_OSDMessage( getIntf(), DEFAULT_CHAN, _( "Quit" ) );
+    playlist_Stop( getIntf()->p_sys->p_playlist );
+
     // Get the instance of OSFactory
     OSFactory *pOsFactory = OSFactory::instance( getIntf() );
 
     // Exit the main OS loop
     pOsFactory->getOSLoop()->exit();
+
+    // Kill libvlc
+    vlc_object_kill( getIntf()->p_libvlc );
 }