diff --git a/src/main/java/com/github/krzysiek944/mscrole/MSCROLE.java b/src/main/java/com/github/krzysiek944/mscrole/MSCROLE.java
index a81bd2b..372b9c2 100644
--- a/src/main/java/com/github/krzysiek944/mscrole/MSCROLE.java
+++ b/src/main/java/com/github/krzysiek944/mscrole/MSCROLE.java
@@ -2,6 +2,8 @@ package com.github.krzysiek944.mscrole;
 
 import com.github.krzysiek944.mscrole.commands.MscroleAdminCommand;
 import com.github.krzysiek944.mscrole.commands.MscroleCommand;
+import com.github.krzysiek944.mscrole.commands.MscroleAdminCommandTabCompleter;
+import com.github.krzysiek944.mscrole.commands.MscroleCommandTabCompleter;
 import com.github.krzysiek944.mscrole.listeners.GuiListener;
 import com.github.krzysiek944.mscrole.listeners.PlayerJoinListener;
 import com.github.krzysiek944.mscrole.services.CurrencyManager;
@@ -46,6 +48,9 @@ public class MSCROLE extends JavaPlugin {
         getCommand("mscroll").setExecutor(new MscroleCommand());
         getCommand("mscrolladmin").setExecutor(new MscroleAdminCommand());
 
+        getCommand("mscroll").setTabCompleter(new MscroleCommandTabCompleter());
+        getCommand("mscrolladmin").setTabCompleter(new MscroleAdminCommandTabCompleter());
+
         getLogger().info("Plugin MSCROLE został włączony!");
     }
 
diff --git a/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.java b/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.java
index 0ebe50d..1de1583 100644
--- a/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.java
+++ b/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.java
@@ -202,7 +202,7 @@ public class MscroleAdminCommand implements CommandExecutor {
         sender.sendMessage(plugin.getPrefix() + plugin.getMessageManager().getMessage("balance-set").replace("{player}", target.getName()).replace("{amount}", String.valueOf(amount)));
     }
 
-    private void listItems(CommandSender sender) {
+    public void listItems(CommandSender sender) {
         sender.sendMessage("");
         sender.sendMessage(plugin.getMessageManager().getMessage("list-items-header"));
         ConfigurationSection itemsSection = plugin.getShopManager().getItems();
diff --git a/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleAdminCommandTabCompleter.java b/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleAdminCommandTabCompleter.java
new file mode 100644
index 0000000..82b60c9
--- /dev/null
+++ b/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleAdminCommandTabCompleter.java
@@ -0,0 +1,26 @@
+package com.github.krzysiek944.mscrole.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MscroleAdminCommandTabCompleter implements TabCompleter {
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        if (args.length == 1) {
+            List<String> subCommands = new ArrayList<>();
+            subCommands.add("add");
+            subCommands.add("remove");
+            subCommands.add("give");
+            subCommands.add("take");
+            subCommands.add("set");
+            subCommands.add("list");
+            return subCommands;
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleCommand.java b/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleCommand.java
index b08adfa..ac81932 100644
--- a/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleCommand.java
+++ b/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleCommand.java
@@ -50,14 +50,6 @@ public class MscroleCommand implements CommandExecutor {
             case "shop":
                 new ShopGUI().openShop(player);
                 break;
-
-            case "admin":
-                if (player.hasPermission(plugin.getConfig().getString("permissions.mscroleadmin"))) {
-                    new AdminGUI().openAdminPanel(player);
-                } else {
-                    player.sendMessage(plugin.getPrefix() + plugin.getMessageManager().getMessage("no-permission"));
-                }
-                break;
             default:
                 player.sendMessage(plugin.getPrefix() + plugin.getMessageManager().getMessage("unknown-command"));
                 break;
@@ -72,7 +64,6 @@ public class MscroleCommand implements CommandExecutor {
         player.sendMessage(plugin.getMessageManager().getMessage("help-balance"));
         player.sendMessage(plugin.getMessageManager().getMessage("help-send"));
         player.sendMessage(plugin.getMessageManager().getMessage("help-shop"));
-        player.sendMessage(plugin.getMessageManager().getMessage("help-admin"));
         player.sendMessage(plugin.getMessageManager().getMessage("help-footer"));
         player.sendMessage("");
     }
diff --git a/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleCommandTabCompleter.java b/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleCommandTabCompleter.java
new file mode 100644
index 0000000..06fb274
--- /dev/null
+++ b/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleCommandTabCompleter.java
@@ -0,0 +1,23 @@
+package com.github.krzysiek944.mscrole.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MscroleCommandTabCompleter implements TabCompleter {
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        if (args.length == 1) {
+            List<String> subCommands = new ArrayList<>();
+            subCommands.add("balans");
+            subCommands.add("wyslij");
+            subCommands.add("sklep");
+            return subCommands;
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/krzysiek944/mscrole/listeners/GuiListener.java b/src/main/java/com/github/krzysiek944/mscrole/listeners/GuiListener.java
index 599f51d..3df0e30 100644
--- a/src/main/java/com/github/krzysiek944/mscrole/listeners/GuiListener.java
+++ b/src/main/java/com/github/krzysiek944/mscrole/listeners/GuiListener.java
@@ -1,6 +1,7 @@
 package com.github.krzysiek944.mscrole.listeners;
 
 import com.github.krzysiek944.mscrole.MSCROLE;
+import com.github.krzysiek944.mscrole.commands.MscroleAdminCommand;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
@@ -84,7 +85,7 @@ public class GuiListener implements Listener {
                     player.sendMessage("");
                     break;
                 case PAPER:
-                    player.performCommand("mscrolladmin list");
+                    new MscroleAdminCommand().listItems(player);
                     break;
                 case BARRIER:
                     break;
diff --git a/target/MSCROLE-1.2.jar b/target/MSCROLE-1.2.jar
index 5d5f2be..f5fb9be 100644
Binary files a/target/MSCROLE-1.2.jar and b/target/MSCROLE-1.2.jar differ
diff --git a/target/classes/com/github/krzysiek944/mscrole/MSCROLE.class b/target/classes/com/github/krzysiek944/mscrole/MSCROLE.class
index b1b1832..a4b0adf 100644
Binary files a/target/classes/com/github/krzysiek944/mscrole/MSCROLE.class and b/target/classes/com/github/krzysiek944/mscrole/MSCROLE.class differ
diff --git a/target/classes/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.class b/target/classes/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.class
index a00a13a..95f6dae 100644
Binary files a/target/classes/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.class and b/target/classes/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.class differ
diff --git a/target/classes/com/github/krzysiek944/mscrole/commands/MscroleAdminCommandTabCompleter.class b/target/classes/com/github/krzysiek944/mscrole/commands/MscroleAdminCommandTabCompleter.class
new file mode 100644
index 0000000..5698df9
Binary files /dev/null and b/target/classes/com/github/krzysiek944/mscrole/commands/MscroleAdminCommandTabCompleter.class differ
diff --git a/target/classes/com/github/krzysiek944/mscrole/commands/MscroleCommand.class b/target/classes/com/github/krzysiek944/mscrole/commands/MscroleCommand.class
index fb8ae2f..be9b1da 100644
Binary files a/target/classes/com/github/krzysiek944/mscrole/commands/MscroleCommand.class and b/target/classes/com/github/krzysiek944/mscrole/commands/MscroleCommand.class differ
diff --git a/target/classes/com/github/krzysiek944/mscrole/commands/MscroleCommandTabCompleter.class b/target/classes/com/github/krzysiek944/mscrole/commands/MscroleCommandTabCompleter.class
new file mode 100644
index 0000000..696d57c
Binary files /dev/null and b/target/classes/com/github/krzysiek944/mscrole/commands/MscroleCommandTabCompleter.class differ
diff --git a/target/classes/com/github/krzysiek944/mscrole/listeners/GuiListener$1.class b/target/classes/com/github/krzysiek944/mscrole/listeners/GuiListener$1.class
index 33bbb1a..8aa73aa 100644
Binary files a/target/classes/com/github/krzysiek944/mscrole/listeners/GuiListener$1.class and b/target/classes/com/github/krzysiek944/mscrole/listeners/GuiListener$1.class differ
diff --git a/target/classes/com/github/krzysiek944/mscrole/listeners/GuiListener.class b/target/classes/com/github/krzysiek944/mscrole/listeners/GuiListener.class
index b75a726..b3a48fd 100644
Binary files a/target/classes/com/github/krzysiek944/mscrole/listeners/GuiListener.class and b/target/classes/com/github/krzysiek944/mscrole/listeners/GuiListener.class differ
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 2346667..97cd11d 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -3,8 +3,10 @@ com\github\krzysiek944\mscrole\MSCROLE.class
 com\github\krzysiek944\mscrole\utils\MessageManager.class
 com\github\krzysiek944\mscrole\utils\DataManager.class
 com\github\krzysiek944\mscrole\utils\ShopDataManager.class
+com\github\krzysiek944\mscrole\commands\MscroleCommandTabCompleter.class
 com\github\krzysiek944\mscrole\gui\ShopGUI.class
 com\github\krzysiek944\mscrole\listeners\GuiListener$1.class
+com\github\krzysiek944\mscrole\commands\MscroleAdminCommandTabCompleter.class
 com\github\krzysiek944\mscrole\gui\AdminGUI.class
 com\github\krzysiek944\mscrole\commands\MscroleAdminCommand.class
 com\github\krzysiek944\mscrole\commands\MscroleCommand.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index a36b74f..6fd4c2d 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,12 +1,14 @@
 C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\commands\MscroleAdminCommand.java
 C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\commands\MscroleCommand.java
-C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\gui\ShopGUI.java
 C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\utils\DataManager.java
+C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\utils\ShopDataManager.java
+C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\gui\ShopGUI.java
 C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\listeners\PlayerJoinListener.java
 C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\listeners\GuiListener.java
 C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\utils\MessageManager.java
+C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\commands\MscroleAdminCommandTabCompleter.java
 C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\MSCROLE.java
-C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\utils\ShopDataManager.java
+C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\commands\MscroleCommandTabCompleter.java
 C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\services\ShopManager.java
 C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\services\CurrencyManager.java
 C:\Users\Krfcm\Documents\visual studio\skript — kopia\src\main\java\com\github\krzysiek944\mscrole\gui\AdminGUI.java
diff --git a/target/original-MSCROLE-1.2.jar b/target/original-MSCROLE-1.2.jar
index 5242b05..bbc90ed 100644
Binary files a/target/original-MSCROLE-1.2.jar and b/target/original-MSCROLE-1.2.jar differ