diff --git a/src/tiled/tilecollisioneditor.cpp b/src/tiled/tilecollisioneditor.cpp
index 3ce84b13d8..493d0162cb 100644
--- a/src/tiled/tilecollisioneditor.cpp
+++ b/src/tiled/tilecollisioneditor.cpp
@@ -172,6 +172,9 @@ void TileCollisionEditor::setTile(Tile *tile)
     mMapScene->disableSelectedTool();
     MapDocument *previousDocument = mMapScene->mapDocument();
 
+    mMapView->setEnabled(tile);
+    mPropertiesDock->setEnabled(tile);
+
     if (tile) {
         Map *map = new Map(Map::Orthogonal, 1, 1, tile->width(), tile->height());
         map->addTileset(tile->sharedTileset());
@@ -207,8 +210,6 @@ void TileCollisionEditor::setTile(Tile *tile)
                 this, &TileCollisionEditor::selectedObjectsChanged);
 
     } else {
-        mMapView->setEnabled(false);
-        mPropertiesDock->setEnabled(false);
         mMapScene->setMapDocument(nullptr);
         mToolManager->setMapDocument(nullptr);
         mPropertiesDock->setDocument(nullptr);