diff --git a/include/ui/paletteeditor.h b/include/ui/paletteeditor.h
index 679e2872..9cd4da03 100644
--- a/include/ui/paletteeditor.h
+++ b/include/ui/paletteeditor.h
@@ -23,7 +23,7 @@ public:
 class PaletteEditor :  public QMainWindow {
     Q_OBJECT
 public:
-    explicit PaletteEditor(Project*, Tileset*, Tileset*, QWidget *parent = nullptr);
+    explicit PaletteEditor(Project*, Tileset*, Tileset*, int paletteId, QWidget *parent = nullptr);
     ~PaletteEditor();
     void setPaletteId(int);
     void setTilesets(Tileset*, Tileset*);
diff --git a/src/core/map.cpp b/src/core/map.cpp
index 8573cc29..667c151a 100644
--- a/src/core/map.cpp
+++ b/src/core/map.cpp
@@ -67,7 +67,7 @@ int Map::getBorderHeight() {
     return layout->border_height.toInt(nullptr, 0);
 }
 
-bool Map::mapBlockChanged(int i, Blockdata *cache) {
+bool Map::mapBlockChanged(int i, Blockdata * cache) {
     if (!cache)
         return true;
     if (!layout->blockdata)
@@ -84,7 +84,7 @@ bool Map::mapBlockChanged(int i, Blockdata *cache) {
     return layout->blockdata->blocks->value(i) != cache->blocks->value(i);
 }
 
-bool Map::borderBlockChanged(int i, Blockdata *cache) {
+bool Map::borderBlockChanged(int i, Blockdata * cache) {
     if (!cache)
         return true;
     if (!layout->border)
diff --git a/src/ui/paletteeditor.cpp b/src/ui/paletteeditor.cpp
index c573fa79..87169784 100644
--- a/src/ui/paletteeditor.cpp
+++ b/src/ui/paletteeditor.cpp
@@ -5,7 +5,7 @@
 #include <QMessageBox>
 #include "log.h"
 
-PaletteEditor::PaletteEditor(Project *project, Tileset *primaryTileset, Tileset *secondaryTileset, QWidget *parent) :
+PaletteEditor::PaletteEditor(Project *project, Tileset *primaryTileset, Tileset *secondaryTileset, int paletteId, QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::PaletteEditor)
 {
@@ -110,8 +110,7 @@ PaletteEditor::PaletteEditor(Project *project, Tileset *primaryTileset, Tileset
     }
 
     this->initColorSliders();
-    this->refreshColorSliders();
-    this->refreshColors();
+    this->setPaletteId(paletteId);
     this->commitEditHistory(this->ui->spinBox_PaletteId->value());
 }
 
diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp
index 17cdcaf7..069a9e23 100644
--- a/src/ui/tileseteditor.cpp
+++ b/src/ui/tileseteditor.cpp
@@ -639,7 +639,7 @@ void TilesetEditor::on_actionChange_Metatiles_Count_triggered()
 void TilesetEditor::on_actionChange_Palettes_triggered()
 {
     if (!this->paletteEditor) {
-        this->paletteEditor = new PaletteEditor(this->project, this->primaryTileset, this->secondaryTileset, this);
+        this->paletteEditor = new PaletteEditor(this->project, this->primaryTileset, this->secondaryTileset, this->paletteId, this);
         connect(this->paletteEditor, SIGNAL(changedPaletteColor()), this, SLOT(onPaletteEditorChangedPaletteColor()));
         connect(this->paletteEditor, SIGNAL(changedPalette(int)), this, SLOT(onPaletteEditorChangedPalette(int)));
     }