diff --git a/fdisk/edit_part.cgi b/fdisk/edit_part.cgi
index 890296699..fe6111d3d 100755
--- a/fdisk/edit_part.cgi
+++ b/fdisk/edit_part.cgi
@@ -259,8 +259,9 @@ if (!$in{'new'} && !$pinfo->{'extended'}) {
 		if ($types[0] eq "swap") {
 			# Swap partition
 			print &ui_buttons_row("../mount/edit_mount.cgi",
-				$text{'edit_newmount2'}, $text{'edit_mountmsg2'},
-				&ui_hidden("type", $types[0]));
+				$text{'edit_newmount2'},$text{'edit_mountmsg2'},
+				&ui_hidden("type", $types[0]).
+				&ui_hidden("newdev", $dev));
 			}
 		else {
 			# For some filesystem
@@ -274,7 +275,8 @@ if (!$in{'new'} && !$pinfo->{'extended'}) {
 				}
 			print &ui_buttons_row("../mount/edit_mount.cgi",
 				$text{'edit_newmount'}, $text{'edit_mountmsg'},
-				undef, $dirsel);
+				&ui_hidden("newdev", $dev),
+				$dirsel);
 			}
 		}
 
diff --git a/fdisk/fdisk-lib.pl b/fdisk/fdisk-lib.pl
index eb544a610..74c277e6b 100755
--- a/fdisk/fdisk-lib.pl
+++ b/fdisk/fdisk-lib.pl
@@ -1170,6 +1170,10 @@ my @stat = @_;
 my $stat = "";
 my $statdesc = $stat[0] =~ /^swap/ ? "<i>$text{'disk_vm'}</i>"
 				   : "<tt>$stat[0]</tt>";
+my $ret = $main::initial_module_name;
+if ($ret !~ /fdisk$/) {
+	$ret = $module_name;
+	}
 if ($stat[1] eq 'raid') {
 	$stat = $statdesc;
 	}
@@ -1193,12 +1197,12 @@ elsif ($stat[0] && !&foreign_available("mount")) {
 	}
 elsif ($stat[0] && $stat[3] == -1) {
 	$stat = "<a href='../mount/edit_mount.cgi?".
-		"index=$stat[4]&temp=1&return=/$module_name/'>".
+		"index=$stat[4]&temp=1&return=/$ret/'>".
 		"$statdesc</a>";
 	}
 elsif ($stat[0]) {
 	$stat = "<a href='../mount/edit_mount.cgi?".
-		"index=$stat[3]&return=/$module_name/'>".
+		"index=$stat[3]&return=/$ret/'>".
 		"$statdesc</a>";
 	}
 return $stat;