diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 4fbd6d42..41704f10 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -1,5 +1,8 @@
 CHANGE LOG
 
+2016-02-13 by lawnmower
+minor usability improvement to artist alias editing
+
 2016-02-11 by newman
 Fix punctuation typo in uploading rules
 
diff --git a/sections/artist/edit.php b/sections/artist/edit.php
index 08add9e1..241eec98 100644
--- a/sections/artist/edit.php
+++ b/sections/artist/edit.php
@@ -102,6 +102,7 @@
 			<ul>
 
 <?
+	$NonRedirectingAliases = array();
 	$DB->query("
 		SELECT AliasID, Name, UserID, Redirect
 		FROM artists_alias
@@ -118,7 +119,12 @@
 <?		}
 		if ($Redirect) { ?>
 					(writes redirect to <span class="tooltip" title="Target alias ID"><?=$Redirect?></span>)
-<?		} ?>
+<?		}
+		else {
+			$NonRedirectingAliases[$AliasID] = $AliasName;
+		}
+?>
+
 					<a href="artist.php?action=delete_alias&amp;aliasid=<?=$AliasID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" title="Delete this alias" class="brackets tooltip">X</a>
 				</li>
 <?	}
@@ -139,9 +145,13 @@
 					<input type="text" name="name" size="40" value="<?=$Name?>" />
 				</div>
 				<div class="field_div">
-					<span class="label"><strong>Writes redirect to (enter an Alias ID; leave blank or enter "0" for no redirect):</strong></span>
-					<br />
-					<input type="text" name="redirect" size="40" value="<?=$DefaultRedirectID?>" /><br />
+					<span class="label"><strong>Writes redirect to:</strong></span>
+					<select name="redirect">
+						<option value="0">Non-redirecting alias</option>
+<?	foreach($NonRedirectingAliases as $AliasID => $AliasName) { ?>
+						<option value="<?=$AliasID?>"<?=$AliasID == $DefaultRedirectID ? " selected" : ""?>><?=$AliasName?></option>
+<?	} ?>
+					</select><br />
 				</div>
 				<div class="submit_div">
 					<input type="submit" value="Add alias" />