6 files changed, 19 insertions, 5 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 81f40697b..53c1f4fd0 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -1456,6 +1456,15 @@ impHandler(commandRecallPc)
     return true;
 }
 
+impHandler(commandIpCheck)
+{
+    const std::string args = event.args;
+    if (args.empty())
+        return false;
+    adminHandler->ipcheckName(args);
+    return true;
+}
+
 impHandler(commandKiller)
 {
     adminHandler->killer(event.args);
diff --git a/src/actions/commands.h b/src/actions/commands.h
index 24860b8f2..5d6e7ce58 100644
--- a/src/actions/commands.h
+++ b/src/actions/commands.h
@@ -125,6 +125,7 @@ namespace Actions
     decHandler(commandGotoNpc);
     decHandler(commandGotoPc);
     decHandler(commandRecallPc);
+    decHandler(commandIpCheck);
     decHandler(commandKiller);
     decHandler(commandKillable);
     decHandler(commandHeal);
diff --git a/src/dyetool/actions/commands.cpp b/src/dyetool/actions/commands.cpp
index e458d494e..9c998f23a 100644
--- a/src/dyetool/actions/commands.cpp
+++ b/src/dyetool/actions/commands.cpp
@@ -125,6 +125,7 @@ impHandlerVoid(commandRandomWarp)
 impHandlerVoid(commandGotoNpc)
 impHandlerVoid(commandGotoPc)
 impHandlerVoid(commandRecallPc)
+impHandlerVoid(commandIpCheck)
 impHandlerVoid(commandKiller)
 impHandlerVoid(commandKillable)
 impHandlerVoid(commandHeal)
diff --git a/src/enums/input/inputaction.h b/src/enums/input/inputaction.h
index 21749b296..101041992 100644
--- a/src/enums/input/inputaction.h
+++ b/src/enums/input/inputaction.h
@@ -699,6 +699,7 @@ enumStart(InputAction)
     CLIPBOARD_COPY,
     COMMAND_GOTO_PC,
     COMMAND_RECALL_PC,
+    COMMAND_IP_CHECK,
     TOTAL
 }
 enumEnd(InputAction);
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index da729206c..6c359b5ff 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1253,10 +1253,6 @@ void PopupMenu::handleLink(const std::string &link,
         if (mTextField)
             mTextField->handlePaste();
     }
-    else if (link == "ipcheck" && !mName.empty())
-    {
-        adminHandler->ipcheckName(mName);
-    }
     else if (link == "gm" && !mName.empty())
     {
         showGMPopup(mName);
@@ -2800,7 +2796,7 @@ void PopupMenu::showPlayerGMCommands(const std::string &name)
     {
         // TRANSLATORS: popup menu item
         // TRANSLATORS: check player ip
-        mBrowserBox->addRow("ipcheck", _("Check ip"));
+        mBrowserBox->addRow("/ipcheck 'NAME'", _("Check ip"));
     }
     // TRANSLATORS: popup menu item
     // TRANSLATORS: go to player position
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 203d3067d..d593011b0 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -5684,6 +5684,12 @@ static const InputActionData inputActionData
         "recall|recallpc",
         UseArgs_true,
         Protected_true},
+    {"keyCommandIpCheck",
+        defaultAction(&Actions::commandIpCheck),
+        InputCondition::INGAME,
+        "ipcheck|checkip",
+        UseArgs_true,
+        Protected_true},
 };
 
 #undef defaultAction