diff --git a/mainwindow.cpp b/mainwindow.cpp
index ea3a571c..f74240f4 100755
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -222,6 +222,12 @@ void MainWindow::displayMapProperties() {
     ui->comboBox_Location->addItems(project->getLocations());
     ui->comboBox_Location->setCurrentText(map->location);
 
+    QMap<QString, QStringList> tilesets = project->getTilesets();
+    ui->comboBox_PrimaryTileset->addItems(tilesets.value("primary"));
+    ui->comboBox_PrimaryTileset->setCurrentText(map->layout->tileset_primary_label);
+    ui->comboBox_SecondaryTileset->addItems(tilesets.value("secondary"));
+    ui->comboBox_SecondaryTileset->setCurrentText(map->layout->tileset_secondary_label);
+
     ui->comboBox_Visibility->addItems(project->getVisibilities());
     ui->comboBox_Visibility->setCurrentText(map->visibility);
 
diff --git a/mainwindow.ui b/mainwindow.ui
index 8714f10d..77405325 100755
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -290,7 +290,7 @@
                     <rect>
                      <x>0</x>
                      <y>0</y>
-                     <width>475</width>
+                     <width>436</width>
                      <height>621</height>
                     </rect>
                    </property>
@@ -451,9 +451,146 @@
                   <number>0</number>
                  </property>
                  <item row="0" column="0">
+                  <widget class="QFrame" name="frame_Tilesets">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="frameShape">
+                    <enum>QFrame::StyledPanel</enum>
+                   </property>
+                   <property name="frameShadow">
+                    <enum>QFrame::Raised</enum>
+                   </property>
+                   <layout class="QFormLayout" name="formLayout">
+                    <item row="0" column="0">
+                     <widget class="QLabel" name="label_PrimaryTileset">
+                      <property name="text">
+                       <string>Primary Tileset</string>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="0" column="1">
+                     <widget class="QComboBox" name="comboBox_PrimaryTileset">
+                      <property name="editable">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="1" column="0">
+                     <widget class="QLabel" name="label_SecondaryTileset">
+                      <property name="text">
+                       <string>Secondary Tileset</string>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="1" column="1">
+                     <widget class="QComboBox" name="comboBox_SecondaryTileset">
+                      <property name="editable">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
+                 <item row="1" column="0">
+                  <widget class="QFrame" name="frame_10">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="frameShape">
+                    <enum>QFrame::NoFrame</enum>
+                   </property>
+                   <property name="frameShadow">
+                    <enum>QFrame::Raised</enum>
+                   </property>
+                   <layout class="QHBoxLayout" name="horizontalLayout_5">
+                    <property name="spacing">
+                     <number>6</number>
+                    </property>
+                    <property name="sizeConstraint">
+                     <enum>QLayout::SetDefaultConstraint</enum>
+                    </property>
+                    <item>
+                     <spacer name="horizontalSpacer_13">
+                      <property name="orientation">
+                       <enum>Qt::Horizontal</enum>
+                      </property>
+                      <property name="sizeHint" stdset="0">
+                       <size>
+                        <width>40</width>
+                        <height>20</height>
+                       </size>
+                      </property>
+                     </spacer>
+                    </item>
+                    <item>
+                     <widget class="QLabel" name="label_16">
+                      <property name="sizePolicy">
+                       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+                        <horstretch>0</horstretch>
+                        <verstretch>0</verstretch>
+                       </sizepolicy>
+                      </property>
+                      <property name="text">
+                       <string>Border</string>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QGraphicsView" name="graphicsView_BorderMetatile">
+                      <property name="sizePolicy">
+                       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                        <horstretch>0</horstretch>
+                        <verstretch>0</verstretch>
+                       </sizepolicy>
+                      </property>
+                      <property name="maximumSize">
+                       <size>
+                        <width>16777215</width>
+                        <height>48</height>
+                       </size>
+                      </property>
+                      <property name="frameShape">
+                       <enum>QFrame::StyledPanel</enum>
+                      </property>
+                      <property name="frameShadow">
+                       <enum>QFrame::Sunken</enum>
+                      </property>
+                      <property name="verticalScrollBarPolicy">
+                       <enum>Qt::ScrollBarAsNeeded</enum>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <spacer name="horizontalSpacer_12">
+                      <property name="orientation">
+                       <enum>Qt::Horizontal</enum>
+                      </property>
+                      <property name="sizeType">
+                       <enum>QSizePolicy::Expanding</enum>
+                      </property>
+                      <property name="sizeHint" stdset="0">
+                       <size>
+                        <width>40</width>
+                        <height>20</height>
+                       </size>
+                      </property>
+                     </spacer>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
+                 <item row="2" column="0">
                   <widget class="QScrollArea" name="scrollArea_2">
                    <property name="sizePolicy">
-                    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                    <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                      <horstretch>0</horstretch>
                      <verstretch>0</verstretch>
                     </sizepolicy>
@@ -470,6 +607,9 @@
                    <property name="widgetResizable">
                     <bool>true</bool>
                    </property>
+                   <property name="alignment">
+                    <set>Qt::AlignHCenter|Qt::AlignTop</set>
+                   </property>
                    <widget class="QWidget" name="scrollAreaWidgetContents_2">
                     <property name="enabled">
                      <bool>true</bool>
@@ -479,7 +619,7 @@
                       <x>0</x>
                       <y>0</y>
                       <width>358</width>
-                      <height>612</height>
+                      <height>497</height>
                      </rect>
                     </property>
                     <property name="sizePolicy">
@@ -488,7 +628,7 @@
                       <verstretch>0</verstretch>
                      </sizepolicy>
                     </property>
-                    <layout class="QGridLayout" name="gridLayout_5" rowstretch="0,0" columnstretch="0">
+                    <layout class="QGridLayout" name="gridLayout_5">
                      <property name="sizeConstraint">
                       <enum>QLayout::SetDefaultConstraint</enum>
                      </property>
@@ -504,97 +644,26 @@
                      <property name="bottomMargin">
                       <number>0</number>
                      </property>
-                     <property name="horizontalSpacing">
-                      <number>0</number>
-                     </property>
-                     <property name="verticalSpacing">
-                      <number>8</number>
-                     </property>
-                     <item row="0" column="0">
-                      <widget class="QFrame" name="frame_10">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
+                     <item row="1" column="1">
+                      <spacer name="verticalSpacer_5">
+                       <property name="orientation">
+                        <enum>Qt::Vertical</enum>
                        </property>
-                       <property name="frameShape">
-                        <enum>QFrame::NoFrame</enum>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>20</width>
+                         <height>40</height>
+                        </size>
                        </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <layout class="QHBoxLayout" name="horizontalLayout_5">
-                        <property name="spacing">
-                         <number>6</number>
-                        </property>
-                        <property name="sizeConstraint">
-                         <enum>QLayout::SetDefaultConstraint</enum>
-                        </property>
-                        <item>
-                         <widget class="QLabel" name="label_16">
-                          <property name="sizePolicy">
-                           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                           </sizepolicy>
-                          </property>
-                          <property name="text">
-                           <string>Border</string>
-                          </property>
-                         </widget>
-                        </item>
-                        <item>
-                         <widget class="QGraphicsView" name="graphicsView_BorderMetatile">
-                          <property name="sizePolicy">
-                           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                           </sizepolicy>
-                          </property>
-                          <property name="maximumSize">
-                           <size>
-                            <width>16777215</width>
-                            <height>48</height>
-                           </size>
-                          </property>
-                          <property name="frameShape">
-                           <enum>QFrame::StyledPanel</enum>
-                          </property>
-                          <property name="frameShadow">
-                           <enum>QFrame::Sunken</enum>
-                          </property>
-                          <property name="verticalScrollBarPolicy">
-                           <enum>Qt::ScrollBarAsNeeded</enum>
-                          </property>
-                         </widget>
-                        </item>
-                        <item>
-                         <spacer name="horizontalSpacer_12">
-                          <property name="orientation">
-                           <enum>Qt::Horizontal</enum>
-                          </property>
-                          <property name="sizeType">
-                           <enum>QSizePolicy::Maximum</enum>
-                          </property>
-                          <property name="sizeHint" stdset="0">
-                           <size>
-                            <width>40</width>
-                            <height>20</height>
-                           </size>
-                          </property>
-                         </spacer>
-                        </item>
-                       </layout>
-                      </widget>
+                      </spacer>
                      </item>
-                     <item row="1" column="0">
+                     <item row="0" column="1">
                       <widget class="QGraphicsView" name="graphicsView_Metatiles">
                        <property name="enabled">
                         <bool>true</bool>
                        </property>
                        <property name="sizePolicy">
-                        <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+                        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                          <horstretch>0</horstretch>
                          <verstretch>0</verstretch>
                         </sizepolicy>
@@ -610,6 +679,32 @@
                        </property>
                       </widget>
                      </item>
+                     <item row="0" column="0">
+                      <spacer name="horizontalSpacer_14">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>40</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="0" column="2">
+                      <spacer name="horizontalSpacer_15">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>40</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
                     </layout>
                    </widget>
                   </widget>
diff --git a/project.cpp b/project.cpp
index 5422e0a2..98c2680b 100755
--- a/project.cpp
+++ b/project.cpp
@@ -354,7 +354,7 @@ void Project::readMapLayout(Map* map) {
         map->layout = mapLayouts[map->layout_label];
     }
 
-    getTilesets(map);
+    getMapTilesets(map);
     loadBlockdata(map);
     loadMapBorder(map);
 }
@@ -494,7 +494,7 @@ void Project::saveMapConstantsHeader() {
     saveTextFile(root + "/include/constants/maps.h", text);
 }
 
-void Project::getTilesets(Map* map) {
+void Project::getMapTilesets(Map* map) {
     if (map->layout->has_unsaved_changes) {
         return;
     }
@@ -955,7 +955,7 @@ Map* Project::addNewMapToGroup(QString mapName, int groupNum) {
     mapNamesToMapConstants->insert(map->name, map->constantName);
     setNewMapHeader(map, mapLayoutsTable.size() + 1);
     setNewMapLayout(map);
-    getTilesets(map);
+    getMapTilesets(map);
     setNewMapBlockdata(map);
     setNewMapBorder(map);
     setNewMapEvents(map);
@@ -1001,6 +1001,47 @@ QStringList Project::getVisibilities() {
     return names;
 }
 
+QMap<QString, QStringList> Project::getTilesets() {
+    QMap<QString, QStringList> allTilesets;
+    QStringList primaryTilesets;
+    QStringList secondaryTilesets;
+    allTilesets.insert("primary", primaryTilesets);
+    allTilesets.insert("secondary", secondaryTilesets);
+    QString headers_text = readTextFile(root + "/data/tilesets/headers.inc");
+    QList<QStringList>* commands = parseAsm(headers_text);
+    int i = 0;
+    while (i < commands->length()) {
+        if (commands->at(i).length() != 2)
+            continue;
+
+        if (commands->at(i).at(0) == ".label") {
+            QString tilesetLabel = commands->at(i).at(1);
+            // Advance to command specifying whether or not it is a secondary tileset
+            i += 2;
+            if (commands->at(i).at(0) != ".byte") {
+                qDebug() << "Unexpected command found for secondary tileset flag. Expected '.byte', but found: " << commands->at(i).at(0);
+                continue;
+            }
+
+            QString secondaryTilesetValue = commands->at(i).at(1);
+            if (secondaryTilesetValue != "TRUE" && secondaryTilesetValue != "FALSE" && secondaryTilesetValue != "0" && secondaryTilesetValue != "1") {
+                qDebug() << "Unexpected secondary tileset flag found. Expected \"TRUE\", \"FALSE\", \"0\", or \"1\", but found: " << secondaryTilesetValue;
+                continue;
+            }
+
+            bool isSecondaryTileset = (secondaryTilesetValue == "TRUE" || secondaryTilesetValue == "1");
+            if (isSecondaryTileset)
+                allTilesets["secondary"].append(tilesetLabel);
+            else
+                allTilesets["primary"].append(tilesetLabel);
+        }
+
+        i++;
+    }
+
+    return allTilesets;
+}
+
 QStringList Project::getWeathers() {
     // TODO
     QStringList names;
diff --git a/project.h b/project.h
index ca5a29d2..61996ac5 100755
--- a/project.h
+++ b/project.h
@@ -57,7 +57,7 @@ public:
     QStringList* readLayoutValues(QString layoutName);
     void readMapLayout(Map*);
     void readMapsWithConnections();
-    void getTilesets(Map*);
+    void getMapTilesets(Map*);
     void loadTilesetAssets(Tileset*);
 
     void saveBlockdata(Map*);
@@ -74,6 +74,7 @@ public:
     QStringList getSongNames();
     QStringList getLocations();
     QStringList getVisibilities();
+    QMap<QString, QStringList> getTilesets();
     QStringList getWeathers();
     QStringList getMapTypes();
     QStringList getBattleScenes();