diff --git a/quiz.admin.inc b/quiz.admin.inc
index 0ade7df..fd4c838 100644
--- a/quiz.admin.inc
+++ b/quiz.admin.inc
@@ -751,6 +751,18 @@ function quiz_questions_form($form, $form_state, $quiz) {
 
   $types = _quiz_get_question_types();
 
+  if ((isset($quiz->quiz_type[LANGUAGE_NONE][0]['value'])) && ($quiz->quiz_type[LANGUAGE_NONE][0]['value'] == "quiz")) {
+    unset($types['quiz_directions']);
+  }
+  // If the quiz is type theory remove all non slides from question browser
+  if ((isset($quiz->quiz_type[LANGUAGE_NONE][0]['value'])) && ($quiz->quiz_type[LANGUAGE_NONE][0]['value'] == "theory")) {
+    foreach ($types as $index => $value) {
+      if ($index !== "quiz_directions") {
+        unset($types[$index]);
+      }
+    }
+  }
+
   _quiz_add_fields_for_creating_questions($form, $types, $quiz);
 
   // Display questions in this quiz.