diff --git a/src/core/FilePath.cpp b/src/core/FilePath.cpp
index 24c9e3528..0506e3ab7 100644
--- a/src/core/FilePath.cpp
+++ b/src/core/FilePath.cpp
@@ -211,6 +211,9 @@ FilePath::FilePath()
     else if (testSetDir(appDirPath + "/share")) {
     }
 #endif
+    // Last ditch test when running in the build directory (mainly for travis tests)
+    else if (testSetDir(QString(KEEPASSX_SOURCE_DIR) + "/share")) {
+    }
 
     if (m_dataPath.isEmpty()) {
         qWarning("FilePath::DataPath: can't find data dir");
diff --git a/src/gui/SearchWidget.ui b/src/gui/SearchWidget.ui
index 281d5f85a..a75642e13 100644
--- a/src/gui/SearchWidget.ui
+++ b/src/gui/SearchWidget.ui
@@ -34,6 +34,9 @@
      <property name="focusPolicy">
       <enum>Qt::ClickFocus</enum>
      </property>
+     <property name="text">
+      <string>Search</string>
+     </property>
      <property name="toolButtonStyle">
       <enum>Qt::ToolButtonIconOnly</enum>
      </property>