diff --git a/modules/social_engineering/clickjacking/command.js b/modules/social_engineering/clickjacking/command.js
index e2870e723..70985c019 100644
--- a/modules/social_engineering/clickjacking/command.js
+++ b/modules/social_engineering/clickjacking/command.js
@@ -18,8 +18,8 @@ beef.execute(function() {
 	var offset_top  = "<%= @offset_top %>";
 	var offset_left = "<%= @offset_left %>";
 	var url = "<%= @url %>";
+	var debug = <%= @debug %>;
 
-	var debug = false;
 	if (debug) opacity = 10; else opacity = 0;
 
 	// create container
diff --git a/modules/social_engineering/clickjacking/config.yaml b/modules/social_engineering/clickjacking/config.yaml
index ccd847e11..0d9d51248 100644
--- a/modules/social_engineering/clickjacking/config.yaml
+++ b/modules/social_engineering/clickjacking/config.yaml
@@ -19,7 +19,7 @@ beef:
             enable: true
             category: "Social Engineering"
             name: "Clickjacking"
-            description: "This module serves as a template for clickjacking attacks.<br />Simply specify the target URL and the offset (in pixels) for the iframe content. The iframe will follow the mouse cursor."
+            description: "This module serves as a template for clickjacking attacks.<br />Simply specify the target URL and the offset (in pixels) for the iframe content. The iframe will follow the mouse cursor.<br />Debug mode creates a visible iframe for testing purposes."
             authors: ["bcoles"]
             target:
                 user_notify: ["FF", "C"]
diff --git a/modules/social_engineering/clickjacking/module.rb b/modules/social_engineering/clickjacking/module.rb
index afa759299..c005d87c5 100644
--- a/modules/social_engineering/clickjacking/module.rb
+++ b/modules/social_engineering/clickjacking/module.rb
@@ -21,7 +21,8 @@ class Clickjacking < BeEF::Core::Command
 		return [
 			{ 'name' => 'url', 'description' => 'Target URL', 'ui_label' => 'Target URL', 'value' => uri, 'width'=>'400px' },
 			{ 'name' => 'offset_top', 'description' => 'Offset Top (in pixels)', 'ui_label' => 'Offset Top (px)', 'value' => '-40', 'width'=>'150px' },
-			{ 'name' => 'offset_left', 'description' => 'Offset Left (in pixels)', 'ui_label' => 'Offset Left (px)', 'value' => '-10', 'width'=>'150px' }
+			{ 'name' => 'offset_left', 'description' => 'Offset Left (in pixels)', 'ui_label' => 'Offset Left (px)', 'value' => '-10', 'width'=>'150px' },
+			{ 'name' => 'debug', 'type' => 'combobox', 'ui_label' => 'Debug Mode', 'store_type' => 'arraystore', 'store_fields' => ['debug'], 'store_data' => [['true'],['false']], 'valueField' => 'debug', 'value' => 'false', editable: false, 'displayField' => 'debug', 'mode' => 'local', 'autoWidth' => true }
 		]
 	end