diff --git a/src/lib/data/Storage.cpp b/src/lib/data/Storage.cpp
index f8dbcfd3..121087b4 100644
--- a/src/lib/data/Storage.cpp
+++ b/src/lib/data/Storage.cpp
@@ -256,6 +256,10 @@ std::vector<SearchMatch> Storage::getAutocompletionMatches(const std::string& qu
 							{
 								return true;
 							}
+							else if (a.text[i] > b.text[i])
+							{
+								return false;
+							}
 						}
 					}
 				}
diff --git a/src/lib_gui/qt/element/QtCodeArea.cpp b/src/lib_gui/qt/element/QtCodeArea.cpp
index 0378e6ef..f81c1fae 100644
--- a/src/lib_gui/qt/element/QtCodeArea.cpp
+++ b/src/lib_gui/qt/element/QtCodeArea.cpp
@@ -102,7 +102,8 @@ QtCodeArea::QtCodeArea(
 	setReadOnly(true);
 	setFrameStyle(QFrame::NoFrame);
 	setLineWrapMode(QPlainTextEdit::NoWrap);
-	setSizePolicy(sizePolicy().horizontalPolicy(), QSizePolicy::Fixed);
+	setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
+
 	viewport()->setCursor(Qt::ArrowCursor);
 
 	m_lineNumberArea = new LineNumberArea(this);
@@ -161,7 +162,7 @@ QSize QtCodeArea::sizeHint() const
 		height += horizontalScrollBar()->height();
 	}
 
-	return QSize(320, height + 1);
+	return QSize(0, height + 1);
 }
 
 uint QtCodeArea::getStartLineNumber() const
@@ -459,7 +460,6 @@ void QtCodeArea::mouseMoveEvent(QMouseEvent* event)
 		scrollbar->setValue(scrollbar->value() - utility::roundToInt(deltaPosRatio * scrollbar->pageStep()));
 
 		m_panningDistance += abs(deltaX + deltaY);
-		std::cout << m_panningDistance << std::endl;
 	}
 
 
diff --git a/src/lib_gui/qt/element/QtCodeFile.cpp b/src/lib_gui/qt/element/QtCodeFile.cpp
index 9b2ea02c..7edda8cc 100644
--- a/src/lib_gui/qt/element/QtCodeFile.cpp
+++ b/src/lib_gui/qt/element/QtCodeFile.cpp
@@ -27,6 +27,7 @@ QtCodeFile::QtCodeFile(const FilePath& filePath, QtCodeFileList* parent)
 	, m_snippetsRequested(false)
 {
 	setObjectName("code_file");
+	setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
 
 	QVBoxLayout* layout = new QVBoxLayout(this);
 	layout->setMargin(0);
diff --git a/src/lib_gui/qt/element/QtCodeFileList.cpp b/src/lib_gui/qt/element/QtCodeFileList.cpp
index 9b5965f5..35d7be93 100644
--- a/src/lib_gui/qt/element/QtCodeFileList.cpp
+++ b/src/lib_gui/qt/element/QtCodeFileList.cpp
@@ -40,11 +40,6 @@ QtCodeFileList::~QtCodeFileList()
 {
 }
 
-QSize QtCodeFileList::sizeHint() const
-{
-	return QSize(800, 800);
-}
-
 void QtCodeFileList::addCodeSnippet(
 	const CodeSnippetParams& params,
 	bool insert
diff --git a/src/lib_gui/qt/element/QtCodeFileList.h b/src/lib_gui/qt/element/QtCodeFileList.h
index 68ebf646..ef45ed4c 100644
--- a/src/lib_gui/qt/element/QtCodeFileList.h
+++ b/src/lib_gui/qt/element/QtCodeFileList.h
@@ -30,8 +30,6 @@ public:
 	QtCodeFileList(QWidget* parent = 0);
 	virtual ~QtCodeFileList();
 
-	virtual QSize sizeHint() const;
-
 	void addCodeSnippet(const CodeSnippetParams& params, bool insert = false);
 	void addFile(std::shared_ptr<TokenLocationFile> locationFile, int refCount, TimePoint modificationTime);
 
diff --git a/src/lib_gui/qt/element/QtCodeSnippet.cpp b/src/lib_gui/qt/element/QtCodeSnippet.cpp
index dc2f878c..e9375b4b 100644
--- a/src/lib_gui/qt/element/QtCodeSnippet.cpp
+++ b/src/lib_gui/qt/element/QtCodeSnippet.cpp
@@ -171,15 +171,6 @@ std::string QtCodeSnippet::getCode() const
 	return m_codeArea->getCode();
 }
 
-void QtCodeSnippet::contextMenuEvent(QContextMenuEvent* event)
-{
-	// QMenu menu(this);
-	// menu.addAction(new QAction("Bar", this));
-	// menu.addAction(new QAction("Brew Tea", this));
-	// menu.addAction(new QAction("Translate", this));
-	// menu.exec(event->globalPos());
-}
-
 void QtCodeSnippet::clickedTitle()
 {
 	if (m_titleId > 0)
diff --git a/src/lib_gui/qt/element/QtCodeSnippet.h b/src/lib_gui/qt/element/QtCodeSnippet.h
index 005e3d06..97c3bd42 100644
--- a/src/lib_gui/qt/element/QtCodeSnippet.h
+++ b/src/lib_gui/qt/element/QtCodeSnippet.h
@@ -47,9 +47,6 @@ public:
 
 	std::string getCode() const;
 
-protected:
-	virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE;
-
 private slots:
 	void clickedTitle();
 	void clickedFooter();