diff --git a/mainwindow.cpp b/mainwindow.cpp
index 697963cd..378c7d71 100755
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -15,6 +15,8 @@
 #include <QSpacerItem>
 #include <QFont>
 #include <QScrollBar>
+#include <QMessageBox>
+#include <QDialogButtonBox>
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -838,3 +840,32 @@ void MainWindow::on_comboBox_SecondaryTileset_activated(const QString &tilesetLa
 {
     editor->updateSecondaryTileset(tilesetLabel);
 }
+
+void MainWindow::on_pushButton_clicked()
+{
+    QDialog dialog(this, Qt::WindowTitleHint | Qt::WindowCloseButtonHint);
+    dialog.setWindowTitle("Change Map Dimensions");
+    dialog.setWindowModality(Qt::NonModal);
+
+    QFormLayout form(&dialog);
+
+    QSpinBox *widthSpinBox = new QSpinBox();
+    QSpinBox *heightSpinBox = new QSpinBox();
+    widthSpinBox->setValue(editor->map->getWidth());
+    heightSpinBox->setValue(editor->map->getHeight());
+    widthSpinBox->setMinimum(1);
+    heightSpinBox->setMinimum(1);
+    widthSpinBox->setMaximum(255);
+    heightSpinBox->setMaximum(255);
+    form.addRow(new QLabel("Width"), widthSpinBox);
+    form.addRow(new QLabel("Height"), heightSpinBox);
+
+    QDialogButtonBox buttonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, &dialog);
+    form.addRow(&buttonBox);
+    connect(&buttonBox, SIGNAL(accepted()), &dialog, SLOT(accept()));
+    connect(&buttonBox, SIGNAL(rejected()), &dialog, SLOT(reject()));
+
+    if (dialog.exec() == QDialog::Accepted) {
+        qDebug() << "Change width";
+    }
+}
diff --git a/mainwindow.h b/mainwindow.h
index 88f08661..b401edd4 100755
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -93,6 +93,8 @@ private slots:
 
     void on_comboBox_SecondaryTileset_activated(const QString &arg1);
 
+    void on_pushButton_clicked();
+
 private:
     Ui::MainWindow *ui;
     QStandardItemModel *mapListModel;
diff --git a/mainwindow.ui b/mainwindow.ui
index 77405325..74c2cf41 100755
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -250,6 +250,13 @@
                   </property>
                  </spacer>
                 </item>
+                <item>
+                 <widget class="QPushButton" name="pushButton">
+                  <property name="text">
+                   <string>Change Dimensions</string>
+                  </property>
+                 </widget>
+                </item>
                </layout>
               </widget>
              </item>
@@ -291,7 +298,7 @@
                      <x>0</x>
                      <y>0</y>
                      <width>436</width>
-                     <height>621</height>
+                     <height>620</height>
                     </rect>
                    </property>
                    <layout class="QGridLayout" name="gridLayout_8">