diff --git a/qml/Sidebar.qml b/qml/Sidebar.qml
index cc724ee270..f56c69fe4e 100644
--- a/qml/Sidebar.qml
+++ b/qml/Sidebar.qml
@@ -15,7 +15,6 @@ UM.AngledCornerRectangle {
     cornerSize: UM.Theme.sizes.default_margin.width;
     
     function showTooltip(item, position, text) {
-        print("omg zomg")
         tooltip.text = text;
         position = item.mapToItem(base, position.x, position.y);
         tooltip.show(position);
@@ -72,16 +71,19 @@ UM.AngledCornerRectangle {
 
             onLoaded:
             { 
-                if(item) item.configureSettings = base.configureMachinesAction;
-                if(typeof(item.onShowTooltip) != 'undefined')
+                if(item)
                 {
-                    item.showTooltip.connect(base.showTooltip)
+                    item.configureSettings = base.configureMachinesAction;
+                    if(item.onShowTooltip != undefined)
+                    {
+                        item.showTooltip.connect(base.showTooltip)
+                    }
+                    if(item.onHideTooltip != undefined)
+                    {
+                        item.hideTooltip.connect(base.hideTooltip)
+                    }
                 }
-                    
             }
-
-            //onShowTooltip: base.showTooltip(item,position,text)
-            //onHideTooltip: base.hideTooltip()   
         }
 
         SaveButton {
diff --git a/qml/SidebarAdvanced.qml b/qml/SidebarAdvanced.qml
index ba7bd8ed87..bdd91fd2f9 100644
--- a/qml/SidebarAdvanced.qml
+++ b/qml/SidebarAdvanced.qml
@@ -1,3 +1,3 @@
 import UM 1.0 as UM
 
-UM.SettingView{}
\ No newline at end of file
+UM.SettingView { }