diff --git a/webclient/src/Members.js b/webclient/src/Members.js
index 950df80..a8fc10b 100644
--- a/webclient/src/Members.js
+++ b/webclient/src/Members.js
@@ -25,7 +25,7 @@ const memberSorts = {
 };
 
 export function MembersDropdown(props) {
-	const { token, name, onChange, value, initial } = props;
+	const { token, name, onChange, value, initial, autofocus } = props;
 	const [response, setResponse] = useState({ results: [] });
 	const searchDefault = {seq: 0, q: initial || '', sort: 'newest_active'};
 	const [search, setSearch] = useState(searchDefault);
@@ -61,6 +61,9 @@ export function MembersDropdown(props) {
 			placeholder='Search for Member'
 			onChange={onChange}
 			onSearchChange={(e, v) => setSearch({seq: parseInt(e.timeStamp), q: v.searchQuery, sort: 'newest_active'})}
+
+			searchInput={{ autoFocus: autofocus }}
+			openOnFocus={!autofocus}
 		/>
 
 	);
diff --git a/webclient/src/Storage.js b/webclient/src/Storage.js
index cde6733..74e8cab 100644
--- a/webclient/src/Storage.js
+++ b/webclient/src/Storage.js
@@ -33,6 +33,7 @@ export function StorageEditor(props) {
 					{...makeProps('member_id')}
 					onChange={handleValues}
 					initial={input.member_name}
+					autofocus={!input.member_name}
 				/>
 			</Form.Field>