diff --git a/scripts/Scene_Map.rb b/scripts/Scene_Map.rb
index 580644d..4cc0d19 100644
--- a/scripts/Scene_Map.rb
+++ b/scripts/Scene_Map.rb
@@ -232,6 +232,16 @@ class Scene_Map
     end
     # Update fast travel
     @fast_travel.update
+	
+    if Input.trigger?(Input::F8)
+      if Graphics.fullscreen == true
+	    Graphics.fullscreen = false
+		$console = false
+	  else
+	    Graphics.fullscreen = true
+		$console = true
+	  end
+    end
     # If showing message window
     if $game_temp.message_window_showing || @ed_message.visible || @doc_message.visible || @desktop_message.visible || @credits_message.visible
       return
@@ -262,9 +272,6 @@ class Scene_Map
       # Set debug calling flag
       $game_temp.debug_calling = true
     end
-    if $GDC && Input.press?(Input::F8)
-      $game_temp.to_title = true
-    end
     # If player is not moving
     unless $game_player.moving?
       # Run calling of each screen
diff --git a/scripts/Scene_Title.rb b/scripts/Scene_Title.rb
index c3ec516..2182d78 100644
--- a/scripts/Scene_Title.rb
+++ b/scripts/Scene_Title.rb
@@ -115,6 +115,15 @@ class Scene_Title
           update_cursor = true
         end
       end
+      if Input.trigger?(Input::F8)
+        if Graphics.fullscreen == true
+	      Graphics.fullscreen = false
+		  $console = false
+	    else
+	      Graphics.fullscreen = true
+		  $console = true
+	    end
+      end
       if update_cursor
         Audio.se_play('Audio/SE/title_cursor.wav', 40)
         @cursor.y = MENU_Y + (24 - @cursor.bitmap.height) / 2 + 24 * @cursor_pos