diff --git a/commands/hugo.go b/commands/hugo.go
index d170ac776..5bf40bbbe 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -196,13 +196,6 @@ func init() {
 
 	// For bash-completion
 	HugoCmd.PersistentFlags().SetAnnotation("logFile", cobra.BashCompFilenameExt, []string{})
-
-	// This message will be shown to Windows users if Hugo is opened from explorer.exe
-	cobra.MousetrapHelpText = `
-
-  Hugo is a command-line tool
-
-  You need to open cmd.exe and run it from there.`
 }
 
 func LoadDefaultSettings() {
diff --git a/commands/hugo_windows.go b/commands/hugo_windows.go
new file mode 100644
index 000000000..7342f21a0
--- /dev/null
+++ b/commands/hugo_windows.go
@@ -0,0 +1,27 @@
+// Copyright 2015 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import "github.com/spf13/cobra"
+
+func init() {
+	// This message to show to Windows users if Hugo is opened from explorer.exe
+	cobra.MousetrapHelpText = `
+
+  Hugo is a command-line tool for generating static website.
+
+  You need to open cmd.exe and run Hugo from there.
+  
+  Visit http://gohugo.io/ for more information.`
+}