diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 7bf861c91f..dd0ef11773 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -145,8 +145,9 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
         caller = self.caller
         account = self.caller.account or caller
         switches = self.switches
-        nicktypes = [switch for switch in switches if switch in (
-            "object", "account", "inputline")] or ["inputline"]
+        nicktypes = [switch for switch in switches if switch in ("object", "account", "inputline")]
+        specified_nicktype = bool(nicktypes)
+        nicktypes = nicktypes if specified_nicktype else ["inputline"]
 
         nicklist = (utils.make_iter(caller.nicks.get(category="inputline", return_obj=True) or []) +
                     utils.make_iter(caller.nicks.get(category="object", return_obj=True) or []) +
@@ -197,6 +198,28 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
                            nicktypestr, old_nickstring, old_replstring))
                 return
 
+        if not self.rhs and self.lhs:
+            # check what a nick is set to
+            strings = []
+            if not specified_nicktype:
+                nicktypes = ("object", "account", "inputline")
+            for nicktype in nicktypes:
+                if nicktype == "account":
+                    obj = account
+                else:
+                    obj = caller
+                nicks = utils.make_iter(obj.nicks.get(category=nicktype, return_obj=True))
+                for nick in nicks:
+                    _, _, nick, repl = nick.value
+                    if nick.startswith(self.lhs):
+                        strings.append("{}-nick: '{}' -> '{}'".format(
+                            nicktype.capitalize(), nick, repl))
+            if strings:
+                caller.msg("\n".join(strings))
+            else:
+                caller.msg("No nicks found matching '{}'".format(self.lhs))
+            return
+
         if not self.args or not self.lhs:
             caller.msg("Usage: nick[/switches] nickname = [realname]")
             return