The Temple of Hatshepsut was in use, and frequently modified, between the 16th century BC and the 12th century AD. From the beginning of the archaeological work at the site in the 19th century, one of the primary research goals has been to understand the modifications made to the building since its initial construction. The present paper provides an overview of the different arguments and ideas proposed for the original configuration of the Upper Courtyard, confronted with evidence from recent excavations between 2014 and 2016 in different parts of the court. In 2000, architect Andrzej Kwaśnica argued for an unprecedented arrangement of the architectural elements of the Upper Courtyard. However, recent archaeological discoveries suggest that the issue should be revisited. The examination of the foundations of the Ptolemaic Portico columns has shown that the six bases may have been in situ since the reign of Hatshepsut.