diff --git a/gamemode/engine/derma/lib/cl_menu_iteminfo.lua b/gamemode/engine/derma/lib/cl_menu_iteminfo.lua
index 5da47b1..6aae74e 100644
--- a/gamemode/engine/derma/lib/cl_menu_iteminfo.lua
+++ b/gamemode/engine/derma/lib/cl_menu_iteminfo.lua
@@ -379,6 +379,7 @@ function iteminfo.givetooltip( p, page, addW )
 	tooltip.Paint = function( self )
 		theme.iteminfopanel( self )
 	end
+	tooltip:SetDrawOnTop( true )
 
 	tooltip.Think = function( self ) -- prevents tooltip from showing when a item is showing its options
 		if( page.showtooltips != nil ) then
diff --git a/gamemode/engine/derma/menus/menu_crafting.lua b/gamemode/engine/derma/menus/menu_crafting.lua
index 932f5c2..58a323a 100644
--- a/gamemode/engine/derma/menus/menu_crafting.lua
+++ b/gamemode/engine/derma/menus/menu_crafting.lua
@@ -307,7 +307,7 @@ function menu.open( dt )
 			local mw, mh = resBars[resID].cont.w ,resBars[resID].cont.h
 
 			-- icon
-			resBars[resID].cont.icon = createItemPanel( mw/8, mh/8, 2, resBars[resID].cont, f )
+			resBars[resID].cont.icon = createItemPanel( mw/8, mh/8, 2, resBars[resID].cont, back, false, true )
 			resBars[resID].cont.icon.SetItem( resID )
 
 			if( resBars[resID].resTbl.amount > 1 ) then
@@ -386,7 +386,7 @@ function menu.open( dt )
 						surface.DrawRect( 0, 0, w, h )
 					end
 
-					itemPanels[count].icon = createItemPanel( (itemWidth*regScale)/2 + padding*2, itemPanels[count].h/2, regScale, itemPanels[count], f )
+					itemPanels[count].icon = createItemPanel( (itemWidth*regScale)/2 + padding*2, itemPanels[count].h/2, regScale, itemPanels[count], back, false, true )
 					itemPanels[count].icon.SetItem( itemid )
 
 					local itemname = vgui.Create( "DLabel", itemPanels[count] )