diff --git a/HuntingDog/Engine/ManagementStudioController.cs b/HuntingDog/Engine/ManagementStudioController.cs
index c940d15..8c2887d 100644
--- a/HuntingDog/Engine/ManagementStudioController.cs
+++ b/HuntingDog/Engine/ManagementStudioController.cs
@@ -68,7 +68,7 @@ public static void SelectFromView(View view, SqlConnectionInfo connInfo, int sel
                     builder.AppendLine(UseDataBaseGo(view.Parent));
                     var noLockHint = addNoLockHint ? " WITH(NOLOCK) " : "";
                     var selectColumns = BuildColumnNames(view.Columns, includeAllCoulumnNamesForViews);
-                    builder.AppendFormat("\tSELECT TOP {0} {1}\r\n\tFROM {2}.{3} {4}", selectTopX, selectColumns, view.Schema, view.Name, noLockHint);
+                    builder.AppendFormat("\tSELECT TOP {0} {1}\r\n\tFROM [{2}].[{3}] {4}", selectTopX, selectColumns, view.Schema, view.Name, noLockHint);
 
                     if (includeWhereClause)
                     {
@@ -102,7 +102,7 @@ public static void SelectFromTable(Table tbl, SqlConnectionInfo connInfo, int se
 
                     var selectColumns = BuildColumnNames(tbl.Columns, includeAllCoulumnNamesForTables);
                     var noLockHint = addNoLockHint ? " WITH(NOLOCK) " : "";            
-                    builder.AppendFormat("\tSELECT TOP {0} {1}\r\n\tFROM {2}.{3} {4}", selectTopXTable, selectColumns, tbl.Schema, tbl.Name, noLockHint);
+                    builder.AppendFormat("\tSELECT TOP {0} {1}\r\n\tFROM [{2}].[{3}] {4}", selectTopXTable, selectColumns, tbl.Schema, tbl.Name, noLockHint);
 
                     if (includeWhereClause)
                     {