diff --git a/src/tiled/tilesetchanges.cpp b/src/tiled/tilesetchanges.cpp
index 27ee62a3d6..b1d50400d0 100644
--- a/src/tiled/tilesetchanges.cpp
+++ b/src/tiled/tilesetchanges.cpp
@@ -36,7 +36,7 @@ RenameTileset::RenameTileset(TilesetDocument *tilesetDocument,
                                                "Change Tileset Name"))
     , mTilesetDocument(tilesetDocument)
     , mOldName(tilesetDocument->tileset()->name())
-    , mNewName(newName)
+    , mNewName(newName.trimmed())
 {}
 
 void RenameTileset::undo()
diff --git a/src/tiled/tilesetdocument.cpp b/src/tiled/tilesetdocument.cpp
index 5f74d7bd77..bf626c5009 100644
--- a/src/tiled/tilesetdocument.cpp
+++ b/src/tiled/tilesetdocument.cpp
@@ -297,7 +297,7 @@ void TilesetDocument::removeMapDocument(MapDocument *mapDocument)
 
 void TilesetDocument::setTilesetName(const QString &name)
 {
-    mTileset->setName(name);
+    mTileset->setName(name.trimmed());
     emit tilesetNameChanged(mTileset.data());
 
     for (MapDocument *mapDocument : mapDocuments())