diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 98fb6e2b10..f1b20df924 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -370,14 +370,9 @@ for ($i = 0; $i < $num_fields; $i++) {
     $ci++;
 
     // column comments
-    $content_cells[$i][$ci] = '<input id="field_' . $i . '_' . ($ci - $ci_offset)
-        . '"' . ' type="text" name="field_comments[' . $i . ']" size="12"'
-        . ' value="' . (isset($row['Field'])
-                && is_array($comments_map)
-                && isset($comments_map[$row['Field']])
-            ?  htmlspecialchars($comments_map[$row['Field']])
-            : '') . '"'
-        . ' class="textfield" />';
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnComment(
+        $i, $ci, $ci_offset, isset($row) ? $row : null, $comments_map
+    );
     $ci++;
 
     // move column
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index ad65035181..673234d99d 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -753,4 +753,29 @@ function PMA_getHtmlForMoveColumn($i, $ci, $ci_offset, $move_columns, $row)
     
     return $html;
 }
+
+/**
+ * Function to get html for column comment
+ * 
+ * @param int   $i            field number
+ * @param int   $ci           cell index
+ * @param int   $ci_offset    cell index offset
+ * @param array $row          row
+ * @param array $comments_map comments map
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnComment($i, $ci, $ci_offset, $row, $comments_map)
+{
+    $html = '<input id="field_' . $i . '_' . ($ci - $ci_offset)
+        . '"' . ' type="text" name="field_comments[' . $i . ']" size="12"'
+        . ' value="' . (isset($row['Field'])
+                && is_array($comments_map)
+                && isset($comments_map[$row['Field']])
+            ?  htmlspecialchars($comments_map[$row['Field']])
+            : '') . '"'
+        . ' class="textfield" />';
+    
+    return $html;
+}
 ?>