diff --git a/administrator/components/com_modules/views/modules/tmpl/modal.php b/administrator/components/com_modules/views/modules/tmpl/modal.php
index 0678c64e747e5..bc76e763077e6 100644
--- a/administrator/components/com_modules/views/modules/tmpl/modal.php
+++ b/administrator/components/com_modules/views/modules/tmpl/modal.php
@@ -46,15 +46,18 @@
 			Joomla.tableOrdering(order, dirn, "");
 		};
 
-		moduleIns = function(type, name) {
-			parent.window.jInsertEditorText("{loadmodule " + type + "," + name + "," + jQuery("#extra_class").val() + "}", "' . $editor . '");
-			parent.window.jModalClose();
-		}
-
-		modulePosIns = function(position) {
-			parent.window.jInsertEditorText("{loadposition " + position + "," + jQuery("#extra_class").val() + "}", "' . $editor . '");
-			parent.window.jModalClose();
-		}
+	        moduleIns = function(type, name) {
+	            var extraVal ,fieldExtra = jQuery("#extra_class");
+	            extraVal = (fieldExtra.length && fieldExtra.val().length) ? "," + fieldExtra.val() : "";
+	            parent.window.jInsertEditorText("{loadmodule " + type + "," + name + extraVal + "}", "' . $editor . '");
+	            parent.window.jModalClose();
+	        }
+	        modulePosIns = function(position) {
+	            var extraVal ,fieldExtra = jQuery("#extra_class");
+	            extraVal = (fieldExtra.length && fieldExtra.val().length) ? "," + fieldExtra.val() : "";
+	            parent.window.jInsertEditorText("{loadposition " + position +  extraVal  + "}", "' . $editor . '");
+	            parent.window.jModalClose();
+	        }
 ');
 ?>
 <div style="padding-top: 25px;"></div>