diff --git a/tageditor.go b/tageditor.go
index d61bf34..58568a9 100644
--- a/tageditor.go
+++ b/tageditor.go
@@ -192,9 +192,83 @@ func tagPopup(node *AudioFile) (err error) {
 
 		audioFile := gomu.playlist.getCurrentFile()
 		_, lang := getLyricDropDown.GetCurrentOption()
-		err := getLyricFromTagEditor(audioFile, lang, lyricDropDown, lyricTextView)
-		if err != nil {
-			errorPopup(err)
+		if audioFile.isAudioFile {
+			go func() {
+				gomu.app.QueueUpdateDraw(func() {
+
+					var titles []string
+					results, err := lyric.GetLyricOptions(lang, audioFile.name)
+					if err != nil {
+						errorPopup(err)
+						gomu.app.Draw()
+					}
+
+					for _, v := range results {
+						titles = append(titles, v.TitleForPopup)
+					}
+
+					searchPopup(" Lyrics ", titles, func(selected string) {
+						if selected == "" {
+							return
+						}
+
+						go func() {
+							var selectedIndex int
+							for i, v := range results {
+								if v.TitleForPopup == selected {
+									selectedIndex = i
+									break
+								}
+							}
+							lyric, err := lyric.GetLyric(results[selectedIndex].LangExt, results[selectedIndex])
+							if err != nil {
+								errorPopup(err)
+								gomu.app.Draw()
+							}
+
+							err = embedLyric(audioFile.path, lyric, lang, false)
+							if err != nil {
+								errorPopup(err)
+								gomu.app.Draw()
+							} else {
+								infoPopup(lang + " lyric added successfully")
+								gomu.app.Draw()
+							}
+
+							// This is to ensure that the above go routine finish.
+							_, popupLyricMap, newOptions, err := loadTagMap(audioFile)
+							if err != nil {
+								errorPopup(err)
+								gomu.app.Draw()
+								return
+							}
+
+							options = newOptions
+							// Update dropdown options
+							lyricDropDown.SetOptions(newOptions, nil).
+								SetCurrentOption(0).
+								SetSelectedFunc(func(text string, _ int) {
+									lyricTextView.SetText(popupLyricMap[text]).
+										SetTitle(" " + text + " lyric preview ")
+								})
+
+							// Update lyric preview
+							if len(newOptions) > 0 {
+								_, langExt := lyricDropDown.GetCurrentOption()
+								lyricTextView.SetText(popupLyricMap[langExt]).
+									SetTitle(" " + langExt + " lyric preview ")
+							} else {
+								lyricTextView.SetText("No lyric embeded.").
+									SetTitle(" lyric preview ")
+							}
+
+						}()
+					})
+
+				})
+			}()
+		} else {
+			errorPopup(errors.New("not an audio file"))
 			gomu.app.Draw()
 		}
 	}).
@@ -347,83 +421,3 @@ func loadTagMap(node *AudioFile) (tag *id3v2.Tag, popupLyricMap map[string]strin
 
 	return tag, popupLyricMap, options, err
 }
-
-func getLyricFromTagEditor(audioFile *AudioFile, lang string, lyricDropDown *tview.DropDown, lyricTextView *tview.TextView) (err error) {
-	if !audioFile.isAudioFile {
-		return errors.New("not an audio file")
-	}
-	go func() {
-		gomu.app.QueueUpdateDraw(func() {
-
-			var titles []string
-			results, err := lyric.GetLyricOptions(lang, audioFile.name)
-			if err != nil {
-				errorPopup(err)
-				gomu.app.Draw()
-			}
-
-			for _, v := range results {
-				titles = append(titles, v.TitleForPopup)
-			}
-
-			searchPopup(" Lyrics ", titles, func(selected string) {
-				if selected == "" {
-					return
-				}
-
-				go func() {
-					var selectedIndex int
-					for i, v := range results {
-						if v.TitleForPopup == selected {
-							selectedIndex = i
-							break
-						}
-					}
-					lyric, err := lyric.GetLyric(results[selectedIndex].LangExt, results[selectedIndex])
-					if err != nil {
-						errorPopup(err)
-						gomu.app.Draw()
-					}
-
-					err = embedLyric(audioFile.path, lyric, lang, false)
-					if err != nil {
-						errorPopup(err)
-						gomu.app.Draw()
-					} else {
-						infoPopup(lang + " lyric added successfully")
-						gomu.app.Draw()
-					}
-
-					// This is to ensure that the above go routine finish.
-					_, popupLyricMap, newOptions, err := loadTagMap(audioFile)
-					if err != nil {
-						errorPopup(err)
-						gomu.app.Draw()
-						return
-					}
-
-					// Update dropdown options
-					lyricDropDown.SetOptions(newOptions, nil).
-						SetCurrentOption(0).
-						SetSelectedFunc(func(text string, _ int) {
-							lyricTextView.SetText(popupLyricMap[text]).
-								SetTitle(" " + text + " lyric preview ")
-						})
-
-					// Update lyric preview
-					if len(newOptions) > 0 {
-						_, langExt := lyricDropDown.GetCurrentOption()
-						lyricTextView.SetText(popupLyricMap[langExt]).
-							SetTitle(" " + langExt + " lyric preview ")
-					} else {
-						lyricTextView.SetText("No lyric embeded.").
-							SetTitle(" lyric preview ")
-					}
-
-				}()
-			})
-
-		})
-	}()
-	return err
-}