diff --git a/src/main/java/com/drtshock/playervaults/commands/Commands.java b/src/main/java/com/drtshock/playervaults/commands/Commands.java
index a6239b5..13188c0 100644
--- a/src/main/java/com/drtshock/playervaults/commands/Commands.java
+++ b/src/main/java/com/drtshock/playervaults/commands/Commands.java
@@ -34,6 +34,7 @@ public class Commands implements CommandExecutor {
         if (cmd.getName().equalsIgnoreCase("pv")) {
             if (sender instanceof Player) {
                 Player p = (Player) sender;
+                if(PlayerVaults.IN_VAULT.containsKey(p.getName())) return true; // don't let them open another vault.
                 switch (args.length) {
                     case 1:
                         if (VaultOperations.openOwnVault(p, args[0])) {
diff --git a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java
index facf7a0..9425909 100644
--- a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java
+++ b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java
@@ -55,8 +55,6 @@ public class Listeners implements Listener {
     public void saveVault(Player player) {
         if (PlayerVaults.IN_VAULT.containsKey(player.getName())) {
             Inventory inv = player.getOpenInventory().getTopInventory();
-            if(inv.getViewers().contains(player))
-                player.closeInventory();
             if (inv.getViewers().size() == 1) {
                 VaultViewInfo info = PlayerVaults.IN_VAULT.get(player.getName());
                 try {