diff --git a/tajo-core/src/main/resources/webapps/admin/query_executor.jsp b/tajo-core/src/main/resources/webapps/admin/query_executor.jsp
index 49a43d45ba..cc3efcefb7 100644
--- a/tajo-core/src/main/resources/webapps/admin/query_executor.jsp
+++ b/tajo-core/src/main/resources/webapps/admin/query_executor.jsp
@@ -300,7 +300,7 @@ function getPage() {
     <%
 	for (String databaseName : master.getCatalog().getAllDatabaseNames()) {
 	%>
-	  <option value="<%=databaseName%>"><%=databaseName%></option>
+	  <option value="<%=databaseName%>" <%= (databaseName.equals("default"))?"selected":"" %> ><%=databaseName%></option>
 	<%
 	}
 	%>