diff --git a/public/javascript/ui/panel/tabs/ZombieTabCommands.js b/public/javascript/ui/panel/tabs/ZombieTabCommands.js
index 64e172ccc..86e48eca3 100644
--- a/public/javascript/ui/panel/tabs/ZombieTabCommands.js
+++ b/public/javascript/ui/panel/tabs/ZombieTabCommands.js
@@ -11,6 +11,36 @@ ZombieTab_Commands = function(zombie) {
 		layout: 'fit',
         autoScroll: true
     });
+
+    var welcomeWindow = new Ext.Window({
+				title: 'Welcome to BeEF',
+                id: 'welcome-window',
+				closable:true,
+				width:450,
+				height:300,
+				plain:true,
+				layout: 'border',
+				shadow: true,
+				items: [
+                    new Ext.Panel({
+                    region: 'center',
+                    padding: '3 3 3 3',
+                    html: "At your left you have all the BeEF command modules organized in a category tree.<br/><br/> " +
+                          "Most command modules consist of Javascript code that is executed against the selected " +
+                          "Hooked Browser. Command modules are able to perform any actions that can be achieved " +
+                          "trough Javascript: for example they may gather information about the Hooked Browser, manipulate the DOM " +
+                          "or perform other activities such as exploiting vulnerabilities within the local network " +
+                          "of the Hooked Browser.<br/><br/>To learn more about writing your own modules please review " +
+                          "the wiki:<br /><a href='http://code.google.com/p/beef/wiki/DevDocs'>" +
+                            "http://code.google.com/p/beef/wiki/DevDocs</a><br/><br/>" +
+                            "Each command module has a traffic light icon, which is used to indicate the following:<ul>" +
+                            "<li><img alt='' src='public/images/icons/red.png'  unselectable='on'> - Command does not work against this target</li>" +
+                            "<li><img alt='' src='public/images/icons/grey.png'  unselectable='on'> - It is unknown if this command works against this target</li>" +
+                            "<li><img alt='' src='public/images/icons/orange.png'  unselectable='on'> - The command works against the target, but may be visible to the user</li>" +
+                            "<li><img alt='' src='public/images/icons/green.png'  unselectable='on'> - The command works against the target and should be invisible to the user</li></ul>"
+                })
+               ]
+    });
 	
 	var command_module_grid = new Ext.grid.GridPanel({
 		store: new Ext.data.JsonStore({
@@ -84,6 +114,7 @@ ZombieTab_Commands = function(zombie) {
              load: function(treeloader, node, response) {
                        // Hide loading mask after tree is fully loaded
                        treeloader.treeLoadingMask.hide();
+                       welcomeWindow.show();
                        return true;
              }
           }
@@ -93,6 +124,9 @@ ZombieTab_Commands = function(zombie) {
 				if(!node.leaf) {
 					node.toggle();
 				} else {
+                    // if the user don't close the welcome window, let hide it automatically
+                    welcomeWindow.hide();
+
 					command_module_config.configLoadMask = new Ext.LoadMask(Ext.getBody(), {msg:"Please wait, module config is loading..."});
 					command_module_config.configLoadMask.show();
 
@@ -133,13 +167,9 @@ ZombieTab_Commands = function(zombie) {
 				new Ext.Panel({
 					id: 'zombie-command-module-west-'+zombie.session,
 					region: 'center',
-					layout: 'fit',
+					layout: 'border',
 					border: false,
-					items: {
-						layout: 'border',
-						border: false,
-						items: [command_module_grid, command_module_config]
-					}
+					items: [command_module_grid, command_module_config]
 			})]
 		},