diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 19394716..fa74f87d 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -593,7 +593,7 @@ function Commands() //{{{
         }
     ));
     addDefaultCommand(new Command(["quita[ll]", "qa[ll]"],
-        function() { quit(false); },
+        function() { vimperator.quit(false); },
         {
             usage: ["quita[ll]"],
             short_help: "Quit Vimperator",
@@ -811,7 +811,7 @@ function Commands() //{{{
         }
     ));
     addDefaultCommand(new Command(["xa[ll]", "wqa[ll]", "wq"],
-        function() { quit(true); },
+        function() { vimperator.quit(true); },
         {
             usage: ["wqa[ll]", "xa[ll]"],
             short_help: "Save the session and quit",
@@ -1536,7 +1536,7 @@ Vimperator.prototype.beep = function()
 }
 
 // quit vimperator, no matter how many tabs/windows are open
-function quit(save_session)
+Vimperator.prototype.quit = function(save_session)
 {
     if (save_session)
         Options.setFirefoxPref("browser.startup.page", 3); // start with saved session
diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js
index 87394c2f..66e00795 100644
--- a/chrome/content/vimperator/mappings.js
+++ b/chrome/content/vimperator/mappings.js
@@ -460,14 +460,14 @@ function Mappings() //{{{
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["ZQ"],
-        function(count) { quit(false); },
+        function(count) { vimperator.quit(false); },
         {
             short_help: "Quit and don't save the session",
             help: "Works like <code class=\"command\">:qall</code>."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["ZZ"],
-        function(count) { quit(true); },
+        function(count) { vimperator.quit(true); },
         {
             short_help: "Quit and save the session",
             help: "Quit Vimperator, no matter how many tabs/windows are open. The session is stored.<br/>" +
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 918e6a7b..8f19bc8e 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -985,7 +985,7 @@ function Tabs() //{{{
         if (count < 1) count = 1;
 
         if (quit_on_last_tab >= 1 && getBrowser().mTabs.length <= count)
-            quit(quit_on_last_tab == 2);
+            vimperator.quit(quit_on_last_tab == 2);
 
         if(focus_left_tab && tab.previousSibling)
             this.select("-1", false);