diff --git a/main.go b/main.go
index aab96c74bad..c48707fa6e5 100644
--- a/main.go
+++ b/main.go
@@ -31,9 +31,11 @@ func main() {
 	app.Name = "Grafana Backend"
 	app.Usage = "grafana web"
 	app.Version = version
-	app.Commands = []cli.Command{cmd.Web, cmd.ImportJson,
+	app.Commands = []cli.Command{
 		cmd.ListAccounts, cmd.CreateAccount, cmd.DeleteAccount,
-		cmd.ListDataSources, cmd.CreateDataSource, cmd.DescribeDataSource, cmd.DeleteDataSource}
+		cmd.ImportDashboard,
+		cmd.ListDataSources, cmd.CreateDataSource, cmd.DescribeDataSource, cmd.DeleteDataSource,
+		cmd.Web}
 	app.Flags = append(app.Flags, []cli.Flag{
 		cli.StringFlag{
 			Name:  "config",
diff --git a/pkg/cmd/dashboard.go b/pkg/cmd/dashboard.go
index 638c80cf38c..a805e16eccb 100644
--- a/pkg/cmd/dashboard.go
+++ b/pkg/cmd/dashboard.go
@@ -14,7 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-var ImportJson = cli.Command{
+var ImportDashboard = cli.Command{
 	Name:        "dashboard:import",
 	Usage:       "imports dashboards in JSON from a directory",
 	Description: "Starts Grafana import process",