SSMS : SELECT TOP n ROWS should have correct database context by aaronbertrand

If I right-click a table and choose "SELECT TOP n ROWS" I get a query window connected to master (or whatever my default database is) that reads like this:

SELECT TOP 1000
...cols...
FROM [database].[schema].[table]

Never mind that there is no ORDER BY or statement terminator (some long-term pet peeves of mine), but why can't it avoid the database prefix and put in the right database? It should come out as:

USE [database];
GO
SELECT TOP 1000
...cols...
FROM [schema].[table]

This is roughly what happens when I choose Script Table as > SELECT To > New Query Editor Window in Denali CTP3 (except it doesn't put the useless and ambiguous TOP in there) and in 2008 R2 SP1 (where the database prefix is still there, for some reason). Why can't these two functions share some code?

As it stands, if I generated the select using SELECT TOP n ROWS, I have to do a bunch of work to use that query as a starting point. I either need to change database context and/or add the database prefix to every new object I add to the query or, more likely, if I am developing a stored procedure or view, I am probably going to have to change database context *and* remove the database prefix from the table name.