diff --git a/examples/jspsych-fullscreen.html b/examples/jspsych-fullscreen.html
new file mode 100644
index 00000000..171fdc2e
--- /dev/null
+++ b/examples/jspsych-fullscreen.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+
+  <script src="../jspsych.js"></script>
+  <script src="../plugins/jspsych-fullscreen.js"></script>
+  <script src="../plugins/jspsych-single-stim.js"></script>
+  <link rel="stylesheet" href="../css/jspsych.css"></link>
+  <style>
+    img {
+      width: 300px;
+    }
+  </style>
+</head>
+
+<script>
+  var fullscreen_trial = {
+    type: 'fullscreen',
+    fullscreen_mode: true
+  }
+
+  var trial_1 = {
+    type: 'single-stim',
+    stimulus: 'img/happy_face_1.jpg',
+    choices: [89, 78], // Y or N
+    prompt: '<p class="center-content">Have you seen this face before? Y or N.</p>'
+  }
+
+  var fullscreen_trial_exit = {
+    type: 'fullscreen',
+    fullscreen_mode: false
+  }
+
+
+  jsPsych.init({
+    timeline: [ fullscreen_trial, trial_1, fullscreen_trial_exit ],
+    on_finish: function() {
+      jsPsych.data.displayData();
+    }
+  });
+</script>
+
+</html>
diff --git a/plugins/jspsych-fullscreen.js b/plugins/jspsych-fullscreen.js
index f73b335b..227dcda5 100644
--- a/plugins/jspsych-fullscreen.js
+++ b/plugins/jspsych-fullscreen.js
@@ -76,6 +76,7 @@ jsPsych.plugins.fullscreen = (function() {
           } else if (element.msRequestFullscreen) {
             element.msRequestFullscreen();
           }
+          endTrial();
         });
       } else {
         if (document.exitFullscreen) {
@@ -87,14 +88,14 @@ jsPsych.plugins.fullscreen = (function() {
         } else if (document.webkitExitFullscreen) {
           document.webkitExitFullscreen();
         }
+        endTrial();
       }
-      endTrial();
     }
 
     function endTrial() {
-      jsPsych.pluginAPI.setTimeout(function(){
+      display_element.innerHTML = '';
 
-        display_element.innerHTML = '';
+      jsPsych.pluginAPI.setTimeout(function(){
 
         var trial_data = {
           success: !keyboardNotAllowed
