diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 493fd76b..7f4cfc39 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -822,7 +822,10 @@ void LibraryWindow::createToolBars()
 	libraryToolBar->addAction(toggleFullScreenAction);
 
     libraryToolBar->addStretch();
-    libraryToolBar->addWidget(searchEdit);
+
+    //Native toolbar search edit
+    //libraryToolBar->addWidget(searchEdit);
+    libraryToolBar->addSearchEdit();
 
     //libraryToolBar->setMovable(false);
 
diff --git a/custom_widgets/yacreader_macosx_toolbar.h b/custom_widgets/yacreader_macosx_toolbar.h
index 2fdbc667..e3777ca1 100644
--- a/custom_widgets/yacreader_macosx_toolbar.h
+++ b/custom_widgets/yacreader_macosx_toolbar.h
@@ -19,8 +19,12 @@ public:
     void hide();
     QMap<QString, QAction *> actions;
 
-signals:
+    //convenience method for YACReaderLibrary search edit
+    void addSearchEdit();
 
+signals:
+    //convenience signal for YACReaderLibrary search edit
+    void searchTextChanged(QString);
 public slots:
 
 protected:
diff --git a/custom_widgets/yacreader_macosx_toolbar.mm b/custom_widgets/yacreader_macosx_toolbar.mm
index e490e57c..fc10057b 100644
--- a/custom_widgets/yacreader_macosx_toolbar.mm
+++ b/custom_widgets/yacreader_macosx_toolbar.mm
@@ -217,6 +217,7 @@ void YACReaderMacOSXToolbar::addStretch()
 
 void YACReaderMacOSXToolbar::addWidget(QWidget *widget)
 {
+    //TODO fix it
    /* QMacNativeWidget *nativeWidget = new QMacNativeWidget();
     QVBoxLayout *layout = new QVBoxLayout();
     layout->addWidget(widget);
@@ -238,3 +239,16 @@ void YACReaderMacOSXToolbar::hide()
 {
     [nativeToolBar setVisible:NO];
 }
+
+void YACReaderMacOSXToolbar::addSearchEdit()
+{
+    QMacToolBarItem *toolBarItem = addItem(QIcon(),"");
+    NSToolbarItem * nativeItem = toolBarItem->nativeToolBarItem();
+
+    static const NSRect searchEditFrameRect = { { 0.0, 0.0 }, { 150, 24.0 } };
+    NSTextField * searchEdit = [[NSTextField alloc] initWithFrame:searchEditFrameRect];
+
+    [searchEdit setBezelStyle:NSTextFieldRoundedBezel];
+
+    [nativeItem setView:searchEdit];
+}