diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs
index f8ad6c00..7fbf0195 100644
--- a/src/perl/common/Core.xs
+++ b/src/perl/common/Core.xs
@@ -348,6 +348,12 @@ combine_level(level, str)
 	int level
 	char *str
 
+void
+command(cmd)
+	char *cmd
+CODE:
+	perl_command(cmd, NULL, NULL);
+
 void
 commands()
 PREINIT:
@@ -458,6 +464,14 @@ PPCODE:
 	XPUSHs(sv_2mortal(new_pv(ret)));
 	g_free_not_null(ret);
 
+void
+command(server, cmd)
+	Irssi::Server server
+	char *cmd
+CODE:
+	perl_command(cmd, server, NULL);
+
+
 #*******************************
 MODULE = Irssi::Core	PACKAGE = Irssi::Windowitem
 #*******************************
@@ -474,3 +488,11 @@ PPCODE:
 	ret = parse_special_string(cmd, item->server, item, data, NULL, flags);
 	XPUSHs(sv_2mortal(new_pv(ret)));
 	g_free_not_null(ret);
+
+void
+command(item, cmd)
+	Irssi::Windowitem item
+	char *cmd
+CODE:
+	perl_command(cmd, item->server, item);
+
diff --git a/src/perl/ui/Window.xs b/src/perl/ui/Window.xs
index f5e61c0e..b4ab69a8 100644
--- a/src/perl/ui/Window.xs
+++ b/src/perl/ui/Window.xs
@@ -34,12 +34,6 @@ print(str, level=MSGLEVEL_CLIENTNOTICE)
 CODE:
 	printtext_string(NULL, NULL, level, str);
 
-void
-command(cmd)
-	char *cmd
-CODE:
-	perl_command(cmd, active_win->active_server, active_win->active);
-
 Irssi::UI::Window
 window_find_name(name)
 	char *name
@@ -99,13 +93,6 @@ OUTPUT:
 MODULE = Irssi::UI::Window  PACKAGE = Irssi::Server
 #*******************************
 
-void
-command(server, cmd)
-	Irssi::Server server
-	char *cmd
-CODE:
-	perl_command(cmd, server, NULL);
-
 void
 print(server, channel, str, level=MSGLEVEL_CLIENTNOTICE)
 	Irssi::Server server
@@ -249,13 +236,6 @@ print(item, str, level=MSGLEVEL_CLIENTNOTICE)
 CODE:
 	printtext_string(item->server, item->name, level, str);
 
-void
-command(item, cmd)
-	Irssi::Windowitem item
-	char *cmd
-CODE:
-	perl_command(cmd, item->server, item);
-
 Irssi::UI::Window
 window_create(item, automatic)
 	Irssi::Windowitem item