diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/link-dropdown.tid b/plugins/tiddlywiki/markdown/EditorToolbar/link-dropdown.tid
new file mode 100644
index 000000000..848da32f6
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/link-dropdown.tid
@@ -0,0 +1,73 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/link-dropdown
+
+\define lingo-base() $:/language/Buttons/Link/
+
+\define add-link-actions()
+\whitespace trim
+<$action-sendmessage $message="tm-edit-text-operation" $param="make-markdown-link" text={{$(linkTiddler)$}} />
+<$action-deletetiddler $filter="[<dropdown-state>] [<searchTiddler>] [<linkTiddler>] [<storeTitle>] [<searchListState>]"/>
+\end
+
+\define get-focus-selector() [data-tiddler-title="$(cssEscapedTitle)$"] .tc-create-wikitext-link input
+
+\define cancel-search-actions-inner()
+<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}><$list filter="[<searchTiddler>get[text]!match<userInput>]" emptyMessage="<$action-deletetiddler $filter='[<searchTiddler>] [<linkTiddler>] [<storeTitle>] [<searchListState>]'/>"><$action-setfield $tiddler=<<searchTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/></$list></$set>
+\end
+
+\define cancel-search-actions() <$list filter="[<storeTitle>!has[text]] +[<searchTiddler>!has[text]]" emptyMessage="<<cancel-search-actions-inner>>"><$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/></$list>
+
+\define external-link()
+\whitespace trim
+<$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;" actions=<<add-link-actions>>>
+{{$:/core/images/chevron-right}}
+</$button>
+\end
+
+\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="<$action-setfield $tiddler='$:/state/search/currentTab' text=<<nextTab>>/>"/>
+
+\define body(config-title)
+\whitespace trim
+''<<lingo Hint>>''
+
+<$vars searchTiddler="""$config-title$/search""" linkTiddler="""$config-title$/link""" linktext="" searchListState=<<qualify "$:/temp/link-search/selected-item">> refreshTitle=<<qualify "$:/temp/link-search/refresh">> storeTitle=<<qualify "$:/temp/link-search/input">>>
+
+<$vars linkTiddler=<<searchTiddler>>>
+<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
+<$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">> class="tc-create-wikitext-link">
+<$macrocall $name="keyboard-driven-input" tiddler=<<searchTiddler>> storeTitle=<<storeTitle>>
+		selectionStateTitle=<<searchListState>> refreshTitle=<<refreshTitle>> type="search" filterMinLength="1"
+		tag="input" focus="true" class="tc-popup-handle" inputCancelActions=<<cancel-search-actions>>
+		inputAcceptActions=<<add-link-actions>> placeholder={{$:/language/Search/Search}} default=""
+		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]" />
+</$keyboard>
+</$keyboard>
+&#32;
+<$reveal tag="span" state=<<storeTitle>> type="nomatch" text="">
+<<external-link>>
+&#32;
+<$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;">
+<<cancel-search-actions>><$set name="cssEscapedTitle" value={{{ [<storyTiddler>escapecss[]] }}}><$action-sendmessage $message="tm-focus-selector" $param=<<get-focus-selector>>/></$set>
+{{$:/core/images/close-button}}
+</$button>
+</$reveal>
+</$vars>
+
+<$reveal tag="div" state=<<storeTitle>> type="nomatch" text="">
+
+<$linkcatcher actions=<<add-link-actions>> to=<<linkTiddler>>>
+
+<$vars userInput={{{ [<storeTitle>get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}>
+
+{{$:/core/ui/SearchResults}}
+
+</$vars>
+
+</$linkcatcher>
+
+</$reveal>
+
+</$vars>
+
+\end
+
+<$macrocall $name="body" config-title=<<qualify "$:/state/Link/">>/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/link.tid b/plugins/tiddlywiki/markdown/EditorToolbar/link.tid
index f1a41317f..009b93802 100755
--- a/plugins/tiddlywiki/markdown/EditorToolbar/link.tid
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/link.tid
@@ -1,15 +1,11 @@
-caption: {{$:/language/Buttons/Link/Caption}} (Markdown)
-condition: [<targetTiddler>type[text/x-markdown]] [<targetTiddler>type[text/markdown]]
-description: {{$:/language/Buttons/Link/Hint}}
-icon: $:/core/images/link
-list-after: $:/core/ui/EditorToolbar/link
-shortcuts: ((link))
 title: $:/plugins/tiddlywiki/markdown/EditorToolbar/link
+list-after: $:/core/ui/EditorToolbar/link
 tags: $:/tags/EditorToolbar
+icon: $:/core/images/link
+caption: {{$:/language/Buttons/Link/Caption}}
+description: {{$:/language/Buttons/Link/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]] [<targetTiddler>type[text/markdown]]
+button-classes: tc-text-editor-toolbar-item-start-group
+shortcuts: ((link))
+dropdown: $:/plugins/tiddlywiki/markdown/EditorToolbar/link-dropdown
 
-<$action-sendmessage
-	$message="tm-edit-text-operation"
-	$param="wrap-selection"
-	prefix="["
-	suffix="]()"
-/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/linkify.tid b/plugins/tiddlywiki/markdown/EditorToolbar/linkify.tid
new file mode 100755
index 000000000..be842544a
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/linkify.tid
@@ -0,0 +1,15 @@
+caption: {{$:/language/Buttons/Linkify/Caption}} (Markdown)
+condition: [<targetTiddler>type[text/x-markdown]] [<targetTiddler>type[text/markdown]]
+description: {{$:/language/Buttons/Linkify/Hint}}
+icon: $:/plugins/tiddlywiki/markdown/images/markdown-linkify
+list-after: $:/core/ui/EditorToolbar/linkify
+shortcuts: ((linkify))
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/linkify
+tags: $:/tags/EditorToolbar
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="["
+	suffix="]()"
+/>
diff --git a/plugins/tiddlywiki/markdown/editor-operations/make-markdown-link.js b/plugins/tiddlywiki/markdown/editor-operations/make-markdown-link.js
new file mode 100644
index 000000000..6ab90f883
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/editor-operations/make-markdown-link.js
@@ -0,0 +1,37 @@
+/*\
+title: $:/plugins/tiddlywiki/markdown/editor-operations/make-markdown-link.js
+type: application/javascript
+module-type: texteditoroperation
+
+Text editor operation to make a markdown link
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["make-markdown-link"] = function(event,operation) {
+	if(operation.selection) {
+		if(event.paramObject.text.includes("://")) {
+			operation.replacement = "[" + operation.selection + "](" + event.paramObject.text + ")";
+		} else {
+			operation.replacement = "[" + operation.selection + "](#" + event.paramObject.text.replaceAll(" ", "%20") + ")";
+		}
+		operation.cutStart = operation.selStart;
+		operation.cutEnd = operation.selEnd;
+	} else {
+		if(event.paramObject.text.includes("://")) {
+			operation.replacement = "<" + event.paramObject.text + ">";
+		} else {
+			operation.replacement = "[](#" + event.paramObject.text.replaceAll(" ", "%20") + ")";
+		}
+		operation.cutStart = operation.selStart;
+		operation.cutEnd = operation.selEnd;
+	}
+	operation.newSelStart = operation.selStart + operation.replacement.length;
+	operation.newSelEnd = operation.newSelStart;
+};
+
+})();
diff --git a/plugins/tiddlywiki/markdown/images/markdown-linkify.tid b/plugins/tiddlywiki/markdown/images/markdown-linkify.tid
new file mode 100644
index 000000000..395faf8d9
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/images/markdown-linkify.tid
@@ -0,0 +1,6 @@
+title: $:/plugins/tiddlywiki/markdown/images/markdown-linkify
+tags: $:/tags/Image
+
+<svg width="22pt" height="22pt" class="tc-markdown-linkify-button tc-image-button" viewBox="0 0 128 128">
+<path d="M17.031185,32.1989189 L9.04781705,32.1989189 L9.04781705,97.1303119 L17.031185,97.1303119 L17.031185,104.049231 L0,104.049231 L0,25.28 L17.031185,25.28 L17.031185,32.1989189 Z M93.6716009,24.75 C90.4007675,30.8326023 88.0193713,37.1590826 86.5274123,43.7294408 C85.0354532,50.299799 84.2894737,56.9705775 84.2894737,63.7417763 C84.2894737,70.6277412 85.0211075,77.3702485 86.484375,83.9692982 C87.9476425,90.568348 90.314693,96.9952485 93.5855263,103.25 L93.5855263,103.25 L83.4287281,103.25 C79.8135965,97.3395468 77.0161732,91.1134868 75.0364583,84.5718202 C73.0567434,78.0301535 72.066886,71.3737208 72.066886,64.6025219 C72.066886,61.3890716 72.3107639,58.017818 72.7985197,54.488761 C73.2862756,50.9597039 74.0035636,47.4449927 74.9503838,43.9446272 C75.8972039,40.4442617 77.0735563,37.0586623 78.4794408,33.7878289 C79.8853253,30.5169956 81.5350877,27.504386 83.4287281,24.75 L83.4287281,24.75 Z M116.638158,24.75 C120.253289,30.6604532 123.050713,36.9152047 125.030428,43.5142544 C127.010143,50.1133041 128,56.7984284 128,63.5696272 C128,66.7830775 127.770468,70.1543311 127.311404,73.6833882 C126.852339,77.2124452 126.149397,80.7128107 125.202577,84.1844846 C124.255757,87.6561586 123.065058,91.0274123 121.630482,94.2982456 C120.195906,97.5690789 118.531798,100.552997 116.638158,103.25 L116.638158,103.25 L106.48136,103.25 C109.637427,97.1673977 111.975786,90.8696089 113.496436,84.3566338 C115.017087,77.8436586 115.777412,71.2015716 115.777412,64.4303728 C115.777412,57.5444079 115.031433,50.7732091 113.539474,44.1167763 C112.047515,37.4603436 109.723501,31.0047515 106.567434,24.75 L106.567434,24.75 Z M37.1101871,44.1061384 L37.1101871,56.702119 L49.0852391,52.799139 L51.3915454,59.8954661 L39.3277893,63.798446 L46.956341,74.1768244 L40.8357588,78.6120289 L33.2072072,68.1449464 L25.7560638,78.3459166 L19.8128898,73.8220081 L27.4414414,63.798446 L15.2889813,59.6293539 L17.5952876,52.5330268 L29.6590437,56.702119 L29.6590437,44.1061384 L37.1101871,44.1061384 Z M49.6493416,97.1303119 L57.6327096,97.1303119 L57.6327096,32.1989189 L49.6493416,32.1989189 L49.6493416,25.28 L66.6805267,25.28 L66.6805267,104.049231 L49.6493416,104.049231 L49.6493416,97.1303119 Z"></path>
+</svg>