diff --git a/quiz.admin.inc b/quiz.admin.inc
index 46b4df3..8038e6c 100755
--- a/quiz.admin.inc
+++ b/quiz.admin.inc
@@ -1218,6 +1218,19 @@ function _quiz_add_revision_checkbox(&$form, &$quiz) {
  *   FAPI form(array)
  */
 function _quiz_question_browser_form(&$hidden_questions, $questions, $form_state, $quiz, $question_types) {
+  // If the quiz is type quiz remove all slides from question browser
+  if ((isset($quiz->quiz_type[LANGUAGE_NONE][0]['value'])) && ($quiz->quiz_type[LANGUAGE_NONE][0]['value'] == "quiz")) {
+    unset($question_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 ($question_types as $index => $value) {
+      if ($index !== "quiz_directions") {
+        unset($question_types[$index]);
+      }
+    }
+  }
+
   if (!is_array($question_types) || count($question_types) == 0) {
     return $form['no_questions'] = array(
       '#markup' => t('No question types are enabled'),