diff --git a/pom.xml b/pom.xml
index 5672a9f..ef7e8df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.srsoftware</groupId>
 	<artifactId>web4rail</artifactId>
-	<version>1.2.61</version>
+	<version>1.2.62</version>
 	<name>Web4Rail</name>
 	<packaging>jar</packaging>
 	<description>Java Model Railway Control</description>
diff --git a/resources/js/plan.js b/resources/js/plan.js
index fc0f5b9..5b293af 100644
--- a/resources/js/plan.js
+++ b/resources/js/plan.js
@@ -14,6 +14,7 @@ var mode = null;
 var messageTimer = null;
 var messageOpacity = 0;
 var trainAwaitingDestination = null;
+var lastTab = null;
 
 function addClass(data){
 	parts = data.split(" ");
@@ -34,24 +35,29 @@ function addTile(x,y){
 function arrangeTabs(){
 	var id = 0;
 	var tabs = $('<div/>',{'class':'tabs'});
+	var winId = $('.window').attr('id')+"-";
+	
 	tabs.insertAfter($('.swapbtn'));
+	var target = null;
 	$('.window > fieldset > legend').each(function(){
-		var fs = this.parentNode;
-		if (!fs.id) fs.id = 'fieldset-'+id;
+		var fs = this.parentNode;		
+		if (!fs.id) fs.id = winId+id;
+		if (fs.id == lastTab) target = this;
 		$(this).appendTo(tabs).click(fs.id,clickLegend);
 		if (id > 0)	{
 			$(fs).hide();			
 		} else $(this).addClass('front');
 		id++;
 	});
+	if (target != null) clickLegend({'data':lastTab,'target':target});
 }
 
 function clickLegend(ev){
-	var fieldsetId = ev.data;
+	lastTab = ev.data;	
 	$('.window > .tabs > legend').removeClass('front');
 	$(ev.target).addClass('front');
 	$('.window > fieldset').hide();
-	$('#'+fieldsetId).show();
+	$('#'+lastTab).show();
 }
 
 function clickTile(x,y){