diff --git a/src/Plots.jl b/src/Plots.jl
index d31d0258..10e7bf6e 100644
--- a/src/Plots.jl
+++ b/src/Plots.jl
@@ -241,10 +241,8 @@ end
 
 const CURRENT_BACKEND = CurrentBackend(:none)
 
-function __init__()
-    # for compatibility with Requires.jl:
-    @init
-
+# for compatibility with Requires.jl:
+@init begin
     if isdefined(Main, :PLOTS_DEFAULTS)
         for (k,v) in Main.PLOTS_DEFAULTS
             default(k, v)
diff --git a/src/output.jl b/src/output.jl
index bdf60d9e..cdb6777b 100644
--- a/src/output.jl
+++ b/src/output.jl
@@ -283,6 +283,9 @@ end
     if Juno.isactive()
         Media.media(Plot, Media.Plot)
 
+
+        _show{B}(io::IO, m::MIME"text/plain", plt::Plot{B}) = show(io, m, plt)
+
         function Juno.render(e::Juno.Editor, plt::Plot)
             Juno.render(e, nothing)
         end