diff --git a/question/editlib.php b/question/editlib.php
index aae05293947..fdbbab6b287 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -1837,13 +1837,25 @@ function print_choose_qtype_to_add_form($hiddenparams) {
         echo '<input type="hidden" name="' . s($name) . '" value="' . s($value) . '" />' . "\n";
     }
     echo "</div>\n";
-    $types = question_type_menu();
     echo '<div class="qtypes">' . "\n";
     echo '<div class="instruction">' . get_string('selectaqtypefordescription', 'question') . "</div>\n";
+    echo '<div class="realqtypes">' . "\n";
+    $types = question_type_menu();
+    $fakeqtypes = array();
     foreach ($types as $qtype => $localizedname) {
+        if ($QTYPES[$qtype]->is_real_question_type()) {
+            print_qtype_to_add_option($qtype, $localizedname);
+        } else {
+            $fakeqtypes[$qtype] = $localizedname;
+        }
+    }
+    echo "</div>\n";
+    echo '<div class="fakeqtypes">' . "\n";
+    foreach ($fakeqtypes as $qtype => $localizedname) {
         print_qtype_to_add_option($qtype, $localizedname);
     }
     echo "</div>\n";
+    echo "</div>\n";
     echo '<div class="submitbuttons">' . "\n";
     echo '<input type="submit" value="' . get_string('next') . '" id="chooseqtype_submit" />' . "\n";
     echo '<input type="submit" id="chooseqtypecancel" name="addcancel" value="' . get_string('cancel') . '" />' . "\n";
diff --git a/question/type/description/questiontype.php b/question/type/description/questiontype.php
index dd948045c7f..e1dfff39009 100644
--- a/question/type/description/questiontype.php
+++ b/question/type/description/questiontype.php
@@ -1,16 +1,33 @@
 <?php  // $Id$
 
-///////////////////
-/// DESCRIPTION ///
-///////////////////
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.org                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards Martin Dougiamas  http://dougiamas.com     //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
 
-/// QUESTION TYPE CLASS //////////////////
-
-//
-// The question type 'description' is not really a question type
-// and it therefore often sticks to some kind of odd behaviour
-//
 /**
+ * The description question type is not acutally a question, it is just a way
+ * to add some static content in the middle of a quiz, or other place that
+ * questions are used.
+ *
  * @package questionbank
  * @subpackage questiontypes
  */
@@ -20,6 +37,10 @@ class description_qtype extends default_questiontype {
         return 'description';
     }
 
+    function is_real_question_type() {
+        return false;
+    }
+
     function is_usable_by_random() {
         return false;
     }
@@ -32,12 +53,10 @@ class description_qtype extends default_questiontype {
     }
 
     function get_question_options(&$question) {
-        // No options to be restored for this question type
         return true;
     }
 
     function save_question_options($question) {
-        /// No options to be saved for this question type:
         return true;
     }
 
@@ -61,11 +80,6 @@ class description_qtype extends default_questiontype {
     }
 
     function actual_number_of_questions($question) {
-        /// Used for the feature number-of-questions-per-page
-        /// to determine the actual number of questions wrapped
-        /// by this question.
-        /// The question type description is not even a question
-        /// in itself so it will return ZERO!
         return 0;
     }
 
@@ -74,12 +88,7 @@ class description_qtype extends default_questiontype {
         $state->penalty = 0;
         return true;
     }
-
 }
-//// END OF CLASS ////
-
-//////////////////////////////////////////////////////////////////////////
-//// INITIATION - Without this line the question type is not in use... ///
-//////////////////////////////////////////////////////////////////////////
+// Register this question type with questionlib.php.
 question_register_questiontype(new description_qtype());
 ?>
diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index ccf4ad0ee4e..23e33de9e12 100644
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -84,6 +84,15 @@ class default_questiontype {
         return $this->local_name();
     }
 
+    /**
+     * @return boolean override this to return false if this is not really a
+     *      question type, for example the description question type is not
+     *      really a question type.
+     */
+    function is_real_question_type() {
+        return true;
+    }
+
     /**
      * @return boolean true if this question type may require manual grading.
      */
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 34d4d385195..4b522f6cbf6 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2916,6 +2916,9 @@ body.notes .notesgroup {
 #chooseqtype .instruction {
   display: none;
 }
+#chooseqtype .fakeqtypes {
+  border-top: 1px solid silver;
+}
 #chooseqtype .qtypeoption {
   margin-bottom: 0.5em;
 }