diff --git a/include/app/ModuleBrowser.hpp b/include/app/ModuleBrowser.hpp
index 785a5cda..01172e19 100644
--- a/include/app/ModuleBrowser.hpp
+++ b/include/app/ModuleBrowser.hpp
@@ -1,23 +1,12 @@
 #pragma once
 #include "app/common.hpp"
-#include "ui/ScrollWidget.hpp"
-#include "ui/SequentialLayout.hpp"
+#include "widgets/Widget.hpp"
 
 
 namespace rack {
 
 
-struct ModuleBrowser : OpaqueWidget {
-	ScrollWidget *moduleScroll;
-	SequentialLayout *moduleLayout;
-
-	ModuleBrowser();
-	void step() override;
-	void draw(const DrawContext &ctx) override;
-	void onHoverKey(const event::HoverKey &e) override;
-};
-
-
+Widget *moduleBrowserCreate();
 json_t *moduleBrowserToJson();
 void moduleBrowserFromJson(json_t *rootJ);
 
diff --git a/include/app/Scene.hpp b/include/app/Scene.hpp
index a6128628..fec3e403 100644
--- a/include/app/Scene.hpp
+++ b/include/app/Scene.hpp
@@ -5,7 +5,6 @@
 #include "ui/ScrollWidget.hpp"
 #include "app/RackWidget.hpp"
 #include "app/Toolbar.hpp"
-#include "app/ModuleBrowser.hpp"
 
 
 namespace rack {
@@ -17,7 +16,7 @@ struct Scene : OpaqueWidget {
 	ZoomWidget *zoomWidget;
 	RackWidget *rackWidget;
 	Toolbar *toolbar;
-	ModuleBrowser *moduleBrowser;
+	Widget *moduleBrowser;
 
 	// Version checking
 	bool devMode = false;
diff --git a/src/app/ModuleBrowser.cpp b/src/app/ModuleBrowser.cpp
index effa1489..8e09a066 100644
--- a/src/app/ModuleBrowser.cpp
+++ b/src/app/ModuleBrowser.cpp
@@ -2,7 +2,10 @@
 #include "widgets/OpaqueWidget.hpp"
 #include "widgets/TransparentWidget.hpp"
 #include "widgets/ZoomWidget.hpp"
+#include "ui/ScrollWidget.hpp"
+#include "ui/SequentialLayout.hpp"
 #include "ui/Label.hpp"
+#include "ui/TextField.hpp"
 #include "ui/MenuOverlay.hpp"
 #include "app/ModuleWidget.hpp"
 #include "app/Scene.hpp"
@@ -20,6 +23,9 @@ namespace rack {
 static std::set<Model*> sFavoriteModels;
 
 
+struct ModuleBrowser;
+
+
 struct ModuleBox : OpaqueWidget {
 	Model *model;
 	/** Lazily created */
@@ -59,6 +65,8 @@ struct ModuleBox : OpaqueWidget {
 	}
 
 	void draw(const DrawContext &ctx) override {
+		visibleFrames = 0;
+
 		// Lazily create ModuleWidget when drawn
 		if (!previewWidget) {
 			Widget *transparentWidget = new TransparentWidget;
@@ -95,83 +103,116 @@ struct ModuleBox : OpaqueWidget {
 		}
 	}
 
-	void onButton(const event::Button &e) override {
-		if (e.action == GLFW_PRESS && e.button == GLFW_MOUSE_BUTTON_LEFT) {
-			// Create module
-			ModuleWidget *moduleWidget = model->createModuleWidget();
-			assert(moduleWidget);
-			app()->scene->rackWidget->addModuleAtMouse(moduleWidget);
-			// This is a bit nonstandard/unsupported usage, but pretend the moduleWidget was clicked so it can be dragged in the RackWidget
-			// e.consume(moduleWidget);
-			// Close Module Browser
-			ModuleBrowser *moduleBrowser = getAncestorOfType<ModuleBrowser>();
-			moduleBrowser->visible = false;
-
-			// Push ModuleAdd history action
-			history::ModuleAdd *h = new history::ModuleAdd;
-			h->setModule(moduleWidget);
-			app()->history->push(h);
-		}
-		OpaqueWidget::onButton(e);
+	void onButton(const event::Button &e) override;
+};
+
+
+struct BrowserSearchField : TextField {
+};
+
+
+struct BrowserSidebar : Widget {
+	BrowserSearchField *searchField;
+
+	BrowserSidebar() {
+		searchField = new BrowserSearchField;
+		addChild(searchField);
+	}
+
+	void step() override {
+		searchField->box.size.x = box.size.x;
+		Widget::step();
 	}
 };
 
 
-ModuleBrowser::ModuleBrowser() {
-	moduleScroll = new ScrollWidget;
-	addChild(moduleScroll);
+struct ModuleBrowser : OpaqueWidget {
+	BrowserSidebar *sidebar;
+	ScrollWidget *moduleScroll;
+	SequentialLayout *moduleLayout;
+
+	ModuleBrowser() {
+		sidebar = new BrowserSidebar;
+		sidebar->box.size.x = 300;
+		addChild(sidebar);
+
+		moduleScroll = new ScrollWidget;
+		addChild(moduleScroll);
 
-	moduleLayout = new SequentialLayout;
-	moduleLayout->spacing = math::Vec(10, 10);
-	moduleScroll->container->addChild(moduleLayout);
+		moduleLayout = new SequentialLayout;
+		moduleLayout->spacing = math::Vec(10, 10);
+		moduleScroll->container->addChild(moduleLayout);
 
-	for (int i = 0; i < 100; i++)
-	for (Plugin *plugin : plugin::plugins) {
-		for (Model *model : plugin->models) {
-			ModuleBox *moduleBox = new ModuleBox;
-			moduleBox->setModel(model);
-			moduleLayout->addChild(moduleBox);
+		for (Plugin *plugin : plugin::plugins) {
+			for (Model *model : plugin->models) {
+				ModuleBox *moduleBox = new ModuleBox;
+				moduleBox->setModel(model);
+				moduleLayout->addChild(moduleBox);
+			}
 		}
 	}
-}
 
-void ModuleBrowser::step() {
-	// TODO resize sidebar
-	float sidebarWidth = 300.0;
+	void step() override {
+		sidebar->box.size.y = box.size.y;
 
-	moduleScroll->box.pos.x = sidebarWidth;
-	moduleScroll->box.size.x = box.size.x - sidebarWidth;
-	moduleScroll->box.size.y = box.size.y;
-	moduleLayout->box.size.x = moduleScroll->box.size.x;
-	moduleLayout->box.size.y = moduleLayout->getChildrenBoundingBox().getBottomRight().y;
+		moduleScroll->box.pos.x = sidebar->box.size.x;
+		moduleScroll->box.size.x = box.size.x - sidebar->box.size.x;
+		moduleScroll->box.size.y = box.size.y;
+		moduleLayout->box.size.x = moduleScroll->box.size.x;
+		moduleLayout->box.size.y = moduleLayout->getChildrenBoundingBox().getBottomRight().y;
 
-	OpaqueWidget::step();
-}
+		OpaqueWidget::step();
+	}
 
-void ModuleBrowser::draw(const DrawContext &ctx) {
-	bndMenuBackground(ctx.vg, 0.0, 0.0, box.size.x, box.size.y, 0);
-	Widget::draw(ctx);
-}
+	void draw(const DrawContext &ctx) override {
+		bndMenuBackground(ctx.vg, 0.0, 0.0, box.size.x, box.size.y, 0);
+		Widget::draw(ctx);
+	}
 
-void ModuleBrowser::onHoverKey(const event::HoverKey &e) {
-	if (e.action == GLFW_PRESS) {
-		switch (e.key) {
-			case GLFW_KEY_ESCAPE: {
-				// Close menu
-				this->visible = false;
-				e.consume(this);
-			} break;
+	void onHoverKey(const event::HoverKey &e) override {
+		if (e.action == GLFW_PRESS) {
+			switch (e.key) {
+				case GLFW_KEY_ESCAPE: {
+					// Close menu
+					this->visible = false;
+					e.consume(this);
+				} break;
+			}
 		}
+
+		if (!e.getConsumed())
+			OpaqueWidget::onHoverKey(e);
 	}
+};
 
-	if (!e.getConsumed())
-		OpaqueWidget::onHoverKey(e);
-}
 
+void ModuleBox::onButton(const event::Button &e) {
+	if (e.action == GLFW_PRESS && e.button == GLFW_MOUSE_BUTTON_LEFT) {
+		// Create module
+		ModuleWidget *moduleWidget = model->createModuleWidget();
+		assert(moduleWidget);
+		app()->scene->rackWidget->addModuleAtMouse(moduleWidget);
+		// This is a bit nonstandard/unsupported usage, but pretend the moduleWidget was clicked so it can be dragged in the RackWidget
+		// e.consume(moduleWidget);
+		// Close Module Browser
+		ModuleBrowser *moduleBrowser = getAncestorOfType<ModuleBrowser>();
+		moduleBrowser->visible = false;
+
+		// Push ModuleAdd history action
+		history::ModuleAdd *h = new history::ModuleAdd;
+		h->setModule(moduleWidget);
+		app()->history->push(h);
+	}
+	OpaqueWidget::onButton(e);
+}
 
 
 // Global functions
 
+Widget *moduleBrowserCreate() {
+	return new ModuleBrowser;
+}
+
 json_t *moduleBrowserToJson() {
 	json_t *rootJ = json_object();
 
diff --git a/src/app/ModuleWidget.cpp b/src/app/ModuleWidget.cpp
index 98596dec..2494323a 100644
--- a/src/app/ModuleWidget.cpp
+++ b/src/app/ModuleWidget.cpp
@@ -138,7 +138,7 @@ ModuleWidget::~ModuleWidget() {
 
 void ModuleWidget::draw(const DrawContext &ctx) {
 	if (module && module->bypass) {
-		nvgGlobalAlpha(ctx.vg, 0.5);
+		nvgGlobalAlpha(ctx.vg, 0.25);
 	}
 	// nvgScissor(ctx.vg, 0, 0, box.size.x, box.size.y);
 	Widget::draw(ctx);
diff --git a/src/app/Scene.cpp b/src/app/Scene.cpp
index 23126a7e..73d5ea04 100644
--- a/src/app/Scene.cpp
+++ b/src/app/Scene.cpp
@@ -31,7 +31,7 @@ Scene::Scene() {
 	addChild(toolbar);
 	scrollWidget->box.pos.y = toolbar->box.size.y;
 
-	moduleBrowser = new ModuleBrowser;
+	moduleBrowser = moduleBrowserCreate();
 	moduleBrowser->visible = false;
 	addChild(moduleBrowser);
 }