diff --git a/repository/TiddlyWiki/TiddlyWiki.class.st b/repository/TiddlyWiki/TiddlyWiki.class.st
index b674546..67240c4 100644
--- a/repository/TiddlyWiki/TiddlyWiki.class.st
+++ b/repository/TiddlyWiki/TiddlyWiki.class.st
@@ -507,10 +507,10 @@ TiddlyWiki >> local: aFileRefence [
 TiddlyWiki >> name [
 	| tempName suffix  |
 	name ifNotNil: [ ^ name ].
-	self file ifNotNil: [ ^ name := self file basenameWithoutExtension ].
 	self remote ifNil: [ ^ name := nil ].
 	(self remote host endsWith: 'tiddlyhost.com') 
 		ifTrue: [ ^ name := (self remote  host splitOn: '.') first  ].
+	self file ifNotNil: [ ^ name := self file basenameWithoutExtension ].	
 	tempName := self remote file.
 	(tempName endsWithAnyOf: #('.html' '.htm')) 
 		ifTrue: [