diff --git a/source/net/filebot/ui/subtitle/SubtitlePanel.java b/source/net/filebot/ui/subtitle/SubtitlePanel.java
index e264e602..7dfb36c3 100644
--- a/source/net/filebot/ui/subtitle/SubtitlePanel.java
+++ b/source/net/filebot/ui/subtitle/SubtitlePanel.java
@@ -16,9 +16,10 @@ import java.awt.geom.Path2D;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -39,12 +40,14 @@ import net.filebot.Language;
 import net.filebot.ResourceManager;
 import net.filebot.Settings;
 import net.filebot.WebServices;
+import net.filebot.media.MediaDetection;
 import net.filebot.ui.AbstractSearchPanel;
 import net.filebot.ui.LanguageComboBox;
 import net.filebot.ui.SelectDialog;
 import net.filebot.util.ui.LabelProvider;
 import net.filebot.util.ui.LinkButton;
 import net.filebot.util.ui.SimpleLabelProvider;
+import net.filebot.web.Movie;
 import net.filebot.web.OpenSubtitlesClient;
 import net.filebot.web.SearchResult;
 import net.filebot.web.SubtitleDescriptor;
@@ -148,7 +151,14 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
 	};
 
 	protected Collection<String> getHistory(SubtitleProvider engine) throws Exception {
-		return Collections.emptyList();
+		final Set<String> names = new TreeSet<String>();
+		for (Movie it : MediaDetection.releaseInfo.getMovieList()) {
+			names.add(it.getName());
+		}
+		for (SearchResult it : MediaDetection.releaseInfo.getTheTVDBIndex()) {
+			names.add(it.getName());
+		}
+		return names;
 	};
 
 	@Override